diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 18:20:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 18:20:55 +0000 |
| commit | 55238a2efa3463a3872214e93c8df822e82d53b2 (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | 4061f1cdc47a15b020a1bae1450b1bb7b9e3220d (diff) | |
| parent | 5dea99327a6443ace9533ca2f60895d720325138 (diff) | |
| download | okhttp-55238a2efa3463a3872214e93c8df822e82d53b2.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 am: bb26711fdd am: 6aa0b0565f am: d5de980a7a
am: 5dea99327a -s ours
Change-Id: I45679791cc4cf428a8e3c4ae4238b5bfc5f25c4e
0 files changed, 0 insertions, 0 deletions