diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 18:26:16 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 18:26:16 +0000 |
| commit | ef494fa4ca14824ded339cc753429c5ca8d86454 (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | c8ca5c0d22e0555e5f5b1f0168f96674505f4bf7 (diff) | |
| parent | 5515db3267df8a625433f4f84acda9871744e7e8 (diff) | |
| download | okhttp-ef494fa4ca14824ded339cc753429c5ca8d86454.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: 5515db3267
Change-Id: I57eabb8a39546703c91e6f3fcb29cc770500c699
0 files changed, 0 insertions, 0 deletions