diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 18:01:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 18:01:44 +0000 |
| commit | bb26711fddd401d50494b61fcdef2c30e9be9af6 (patch) | |
| tree | aee1888414fc424a40588309b33470cd983fc5c8 | |
| parent | 72bd84cc18b40a761e190e47c1cc12fcea156528 (diff) | |
| parent | 2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 (diff) | |
| download | okhttp-bb26711fddd401d50494b61fcdef2c30e9be9af6.tar.gz | |
Merge "Skip commit '92bbc8ec30776858db942383b7ade6c0aeeaaa65' in nougat-mr1-cts-dev as the commit was marked as DO NOT MERGE." into nougat-mr1-cts-dev
am: 2aa19448cf -s ours
Change-Id: I5b1e81a7048ca8567a91fbe459e22dbed6b74865
0 files changed, 0 insertions, 0 deletions