Skip to content
Commit b2b73e49 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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.
parents 19dc697f c20c2ea2
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment