tree 5c07c220f943af2613f82d9aa64037d0765c3fa5
parent 9bbd2f977ba4d6c4642f96673f937a677ff0beb2
parent 77ceb5e8f18608cdbf19831f6188db87a5e0c058
author Kenny Root <kroot@google.com> 1395767967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1395767967 -0700

am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"

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