| commit | a3a52a96543bd3874e23d90f91b5f4197eab98e5 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 31 19:14:48 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 31 19:14:48 2015 +0000 |
| tree | 9b86271c5b935d9290459590a65ec335ba9eba19 | |
| parent | 826d63572be4b23ad2f70f3004d520d54ef4dc01 [diff] | |
| parent | 4999b175e9c25b7e860f9c2f3b6566d08c8e50e7 [diff] |
am 4999b175: (-s ours) Merge "Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE" into lmp-mr1-modular-dev * commit '4999b175e9c25b7e860f9c2f3b6566d08c8e50e7': Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE