| commit | a7645df5973cfb26aecabe093409e33eb745df17 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 16:40:14 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 31 16:40:15 2015 +0000 |
| tree | 8b3c12ce16dd51f78083fd4e520bd152bfd31c79 | |
| parent | 400fd04fa14309220b74fcd87d5a3eb66ab430bf [diff] | |
| parent | 9eed9e962c20332397da9823745ed59c3510a572 [diff] |
Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev