tree 16cc50dd83d15f6a618eaa0607bc07128620b34b
parent 1cc9d3a1b85bdd736e284f01e022030e0b782f21
parent 3a2f341d846add4567f523b109a808e1b2968bff
author Tobias Thierer <tobiast@google.com> 1499094921 +0000
committer android-build-merger <android-build-merger@google.com> 1499094921 +0000

Revert "Track updates to Conscrypt". DO NOT MERGE ANYWHERE.
am: 3a2f341d84  -s ours

Change-Id: I6b11c4ae2aae772dc90a3ae98aa03104f5214672