| commit | 5fdb2ea76a8e0ffe8786a1e92ce565f7380384db | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 16:46:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 16:46:39 2015 +0000 |
| tree | 65501ef22422ea1051660ceb2f0018ef56dc4e88 | |
| parent | df736de8d8165b1aff675d00581ccdf94a7547aa [diff] | |
| parent | a7645df5973cfb26aecabe093409e33eb745df17 [diff] |
am a7645df5: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit 'a7645df5973cfb26aecabe093409e33eb745df17': Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE