diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 18:28:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 18:28:23 +0000 |
| commit | 37945bf92500da8227f948904f57a96c7b25616c (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | 2a5069938c167c40da4210a6f9d17d4eef3539a0 (diff) | |
| parent | ef494fa4ca14824ded339cc753429c5ca8d86454 (diff) | |
| download | okhttp-37945bf92500da8227f948904f57a96c7b25616c.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
am: ef494fa4ca -s ours
Change-Id: I1de5158ad066af70dffa8c1b40404d5cad31ccb9
0 files changed, 0 insertions, 0 deletions