OSDN Git Service

Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev
authorKenny Root <kroot@google.com>
Tue, 31 Mar 2015 16:40:14 +0000 (16:40 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 31 Mar 2015 16:40:15 +0000 (16:40 +0000)
commita7645df5973cfb26aecabe093409e33eb745df17
tree8b3c12ce16dd51f78083fd4e520bd152bfd31c79
parent400fd04fa14309220b74fcd87d5a3eb66ab430bf
parent9eed9e962c20332397da9823745ed59c3510a572
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev