tree 6b557439b1ed5bfa43e57165a9559d86fe498175
parent cf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2
parent d8c32164e19d16cf7d66b9aee368369ae16a4f0d
author Alex Klyubin <klyubin@google.com> 1395427647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395427647 +0000

am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

* commit 'd8c32164e19d16cf7d66b9aee368369ae16a4f0d':
  Adjust to the change in the private SSLParameterImpl API.