OSDN Git Service

am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl...
authorAlex Klyubin <klyubin@google.com>
Fri, 21 Mar 2014 18:47:27 +0000 (18:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 18:47:27 +0000 (18:47 +0000)
commit92ec0a0c7a568a77696964c16f4e44292c633ef1
tree6b557439b1ed5bfa43e57165a9559d86fe498175
parentcf0c4a59b6d6c7d0abe6b643e200af2eb9f0d6b2
parentd8c32164e19d16cf7d66b9aee368369ae16a4f0d
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.