| commit | 05a87ee0c96b93f926d1e0044139433d6d69006f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jun 11 15:22:29 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jun 11 15:22:29 2015 +0000 |
| tree | 3b01a862b7ef9deb62566c19d5c24a1ccc550aa7 | |
| parent | 1127c1965c2c0789b368062cfd7ba0b5c4031444 [diff] | |
| parent | ca6d8d34ee0e834b8c66e05aea93ec3d7abddb6b [diff] |
Merge "external/conscrypt: tweaks for next BoringSSL import." into mnc-dev