| commit | fb9ff42d7401d0a2c58140fe306460852ea51167 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 16:54:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 16:54:29 2015 +0000 |
| tree | 788e203a1e55235a23a76be6097dec0425bbd871 | |
| parent | c0ca0de76e2a8b72ecc4068fcf5dfbef519e7ca6 [diff] | |
| parent | fbd8805cd783e34aebf521913aeab6cfd483b7b2 [diff] |
am fbd8805c: Merge "Track change to Conscrypt" into lmp-mr1-ub-dev * commit 'fbd8805cd783e34aebf521913aeab6cfd483b7b2': Track change to Conscrypt