Commit 40be99b8 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE. 

am: 3a2f341d  -s ours

Change-Id: I6b11c4ae2aae772dc90a3ae98aa03104f5214672
parents 1cc9d3a1 3a2f341d
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment