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