| commit | 34702d2e7ea695ee2a05095307c517fa67839a8b | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 23:00:58 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 23:00:58 2015 +0000 |
| tree | 750f1e19f0b3898bd9e42773fa511dabce2197f6 | |
| parent | db3ff2221f5db77823162ff4b80248127f2a9398 [diff] | |
| parent | 28c51bacbde1a2a497e20fa4f299fa653eaac9a3 [diff] |
am 28c51bac: (-s ours) am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit '28c51bacbde1a2a497e20fa4f299fa653eaac9a3': Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE