diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-07-03 15:15:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-03 15:15:25 +0000 |
| commit | 69a030d9fbae7ce9478809e4d83bbe8d9ea55a21 (patch) | |
| tree | acd9e053d605bb0c1a2fc0f5dba4589b69d25feb | |
| parent | 500c9e4449235bbbedf9dc03e185a8165afc5acc (diff) | |
| parent | b7239c76981e67f568db09abaaf4c1d4a0a154b7 (diff) | |
| download | okhttp-69a030d9fbae7ce9478809e4d83bbe8d9ea55a21.tar.gz | |
Revert "Track changes to Conscrypt". DO NOT MERGE ANYWHERE.
am: b7239c7698 -s ours
Change-Id: I506a7b1e03e5db75cf4e75543f297ef3c454aa5f
0 files changed, 0 insertions, 0 deletions