diff options
| author | Kenny Root <kroot@google.com> | 2014-03-25 10:19:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 10:19:27 -0700 |
| commit | c1d863e7a4b55f8e583067eebaffc6686723d7ab (patch) | |
| tree | 5c07c220f943af2613f82d9aa64037d0765c3fa5 /libs | |
| parent | 9bbd2f977ba4d6c4642f96673f937a677ff0beb2 (diff) | |
| parent | 77ceb5e8f18608cdbf19831f6188db87a5e0c058 (diff) | |
| download | frameworks_base-c1d863e7a4b55f8e583067eebaffc6686723d7ab.zip frameworks_base-c1d863e7a4b55f8e583067eebaffc6686723d7ab.tar.gz frameworks_base-c1d863e7a4b55f8e583067eebaffc6686723d7ab.tar.bz2 | |
am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
* commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058':
Use X509ExtendedTrustManager and not Conscrypt
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions