diff options
author | Xin Li <delphij@google.com> | 2017-02-18 00:42:45 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-02-18 00:42:45 +0000 |
commit | df2c3e714db448cad644b5d550e0f833615d4b50 (patch) | |
tree | 596aea6e32250865c9141c116649bd83e5a95c6f | |
parent | 0b809cf8b16274578a3a82835404486718e44a7a (diff) | |
parent | e7a565e3610b46f4200a778a52b850a3d91861c3 (diff) | |
download | okhttp-df2c3e714db448cad644b5d550e0f833615d4b50.tar.gz |
Merge "Mark nougat-mr1-cts-dev revision 2aa19448cfc0dbd159e1f7dcad3e622ac08eb1d0 in master as merged." am: 95880e5eb1
am: e7a565e361
Change-Id: If9cdd4becb3b13bb7f8a0a1a21243b0ffa7f8e75
0 files changed, 0 insertions, 0 deletions