tree 9057065f90ed0b0659ca98adef36d059fdbb976a
parent e738edfe62921995493321cafa30c42963b1058f
parent 35e8a31bfabfecfda738b4f26960da0ea245dc42
author Chad Brubaker <cbrubaker@google.com> 1447369858 +0000
committer android-build-merger <android-build-merger@google.com> 1447369858 +0000

Merge "Support X509TrustManagerExtensions methods" am: b324fb18d9 am: 8f45b48757
am: 35e8a31bfa

* commit '35e8a31bfabfecfda738b4f26960da0ea245dc42':
  Support X509TrustManagerExtensions methods