tree 4d80f30380e3413d309bdf3dc545f9ecb5739d29
parent a26cafc2b2f072086aba2da0f5651fc9af5e6486
parent b324fb18d916d7037ef7c94a1d54b55d50ffc9c7
author Chad Brubaker <cbrubaker@google.com> 1447356892 +0000
committer android-build-merger <android-build-merger@google.com> 1447356892 +0000

Merge "Support X509TrustManagerExtensions methods"
am: b324fb18d9

* commit 'b324fb18d916d7037ef7c94a1d54b55d50ffc9c7':
  Support X509TrustManagerExtensions methods