| commit | 28c51bacbde1a2a497e20fa4f299fa653eaac9a3 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 19:22:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 19:22:17 2015 +0000 |
| tree | 23367445da74494cc5a70e2a12c35e44a7f304ab | |
| parent | 543189eb711c7aeefab9566b74b62c34d35115f5 [diff] | |
| parent | a3a52a96543bd3874e23d90f91b5f4197eab98e5 [diff] |
am a3a52a96: (-s ours) am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit 'a3a52a96543bd3874e23d90f91b5f4197eab98e5': Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE