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