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