diff options
| author | Xin Li <delphij@google.com> | 2017-01-13 18:17:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-13 18:17:54 +0000 |
| commit | 5dea99327a6443ace9533ca2f60895d720325138 (patch) | |
| tree | 2208e0e0dd66df54d317e5371a406fb49480a06c | |
| parent | 82f5a30c7415bdbd19be7d82a80b2d9b3f5f76e3 (diff) | |
| parent | d5de980a7a1dcb96fa1108f0be35652715cbc231 (diff) | |
| download | okhttp-5dea99327a6443ace9533ca2f60895d720325138.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
Change-Id: I7df0b7970686333242c584539969278ddadc51e2
0 files changed, 0 insertions, 0 deletions