tree 8b9e60420ca8d32076f47de47241f29a47a33dac
parent 9eed9e962c20332397da9823745ed59c3510a572
author Kenny Root <kroot@google.com> 1427818294 -0700
committer Kenny Root <kroot@google.com> 1427818540 -0700

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

This reverts commit 693ea60e9e3d2ef476e4f45caac234360d90bdb9.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b