| commit | fbd8805cd783e34aebf521913aeab6cfd483b7b2 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 17 22:21:52 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Mar 17 22:21:58 2015 +0000 |
| tree | f423c7237f88645a3aeabb8ab88a73ceb924c306 | |
| parent | 83419118e3c72311ef6b900457d1b03fd5c77883 [diff] | |
| parent | 693ea60e9e3d2ef476e4f45caac234360d90bdb9 [diff] |
Merge "Track change to Conscrypt" into lmp-mr1-ub-dev