| commit | cd04bb4fc4e999ff82732481b29e7b221b61c883 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Nov 26 18:13:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:13:55 2014 +0000 |
| tree | 8ce6eb454d2df99d869c5078ec8f921b1af3f86e | |
| parent | 24a9ddde72262312d03fe733855660f2e61947b2 [diff] | |
| parent | 3476a2a0b2eea94e695a087fa0582bf128e8761b [diff] |
am 3476a2a0: am 564ec716: Merge "Track change to Conscrypt" * commit '3476a2a0b2eea94e695a087fa0582bf128e8761b': Track change to Conscrypt