OSDN Git Service

am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"
authorKenny Root <kroot@google.com>
Tue, 25 Mar 2014 17:19:27 +0000 (10:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 25 Mar 2014 17:19:27 +0000 (10:19 -0700)
commitc1d863e7a4b55f8e583067eebaffc6686723d7ab
tree5c07c220f943af2613f82d9aa64037d0765c3fa5
parent9bbd2f977ba4d6c4642f96673f937a677ff0beb2
parent77ceb5e8f18608cdbf19831f6188db87a5e0c058
am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"

* commit '77ceb5e8f18608cdbf19831f6188db87a5e0c058':
  Use X509ExtendedTrustManager and not Conscrypt