| commit | 266de3efcd4b57ba3b301d87ff0fb692090d9a95 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 25 19:17:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 19:17:44 2014 +0000 |
| tree | 7f5b291d42f8c9a6bf6918caaf1b9c1e3276475d | |
| parent | 732d5aaa3bf50c06f3a7f306221613f4625610f3 [diff] | |
| parent | dd3e6399098c46e0d38c810213fd956bed305c62 [diff] |
am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" * commit 'dd3e6399098c46e0d38c810213fd956bed305c62': Use X509ExtendedTrustManager and not Conscrypt