tree 7f2aeb4d1dffb78996cf1ef38bd885ab54364f61
parent 13d8e41d3a866df0899a89c44c6afc4e2eb31bdc
parent 9a7c1a35491e06af2711abb760a209d2f82c8247
author Kenny Root <kroot@google.com> 1427829048 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427829050 +0000

Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev