| commit | b2b73e4956fa2ffebc80893b68f37989a631eca1 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Mon Jul 03 15:07:20 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 03 15:07:20 2017 +0000 |
| tree | 2dc38dd048f1e2a224330a209bd640f743b91f9f | |
| parent | 19dc697f33c2cfb72ce1e8fcee51f5d4e7ed1c74 [diff] | |
| parent | c20c2ea28ea755a40263545c34adffe72f675a60 [diff] |
Merge changes from topic 'revert-update-conscrypt' into oc-dr1-dev * changes: Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE. Revert "Delete obsolete and unused KeyStoreTests". DO NOT MERGE ANYWHERE.