| commit | c1d863e7a4b55f8e583067eebaffc6686723d7ab | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Tue Mar 25 10:19:27 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 25 10:19:27 2014 -0700 |
| tree | 5c07c220f943af2613f82d9aa64037d0765c3fa5 | |
| parent | 9bbd2f977ba4d6c4642f96673f937a677ff0beb2 [diff] | |
| parent | 77ceb5e8f18608cdbf19831f6188db87a5e0c058 [diff] |
am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" * commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058': Use X509ExtendedTrustManager and not Conscrypt