diff options
author | Tobias Thierer <tobiast@google.com> | 2017-07-03 15:25:07 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-03 15:25:07 +0000 |
commit | 5319a3f0bfa1543e461cd4db99c17ebc5859de8c (patch) | |
tree | acd9e053d605bb0c1a2fc0f5dba4589b69d25feb | |
parent | 500c9e4449235bbbedf9dc03e185a8165afc5acc (diff) | |
parent | 69a030d9fbae7ce9478809e4d83bbe8d9ea55a21 (diff) | |
download | okhttp-5319a3f0bfa1543e461cd4db99c17ebc5859de8c.tar.gz |
Revert "Track changes to Conscrypt". DO NOT MERGE ANYWHERE. am: b7239c7698 -s oursandroid-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10oreo-mr1-vts-releaseoreo-mr1-devoreo-mr1-cts-dev
am: 69a030d9fb -s ours
Change-Id: Idcebb434cd6369215eb369c81ba961f885d429ea
0 files changed, 0 insertions, 0 deletions