OSDN Git Service

am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private...
authorAlex Klyubin <klyubin@google.com>
Fri, 21 Mar 2014 18:53:20 +0000 (18:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 18:53:20 +0000 (18:53 +0000)
commit7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3
treebc4abcc3fb13746dc03fe2d8d1962ba67c89c856
parentb8846c819e43535250b004dde593892fa305b7e7
parent92ec0a0c7a568a77696964c16f4e44292c633ef1
am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

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