commit | 5319a3f0bfa1543e461cd4db99c17ebc5859de8c | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Mon Jul 03 15:25:07 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 03 15:25:07 2017 +0000 |
tree | acd9e053d605bb0c1a2fc0f5dba4589b69d25feb | |
parent | 500c9e4449235bbbedf9dc03e185a8165afc5acc [diff] | |
parent | 69a030d9fbae7ce9478809e4d83bbe8d9ea55a21 [diff] |
Revert "Track changes to Conscrypt". DO NOT MERGE ANYWHERE. am: b7239c7698 -s ours am: 69a030d9fb -s ours Change-Id: Idcebb434cd6369215eb369c81ba961f885d429ea