tree 8f9c106be2c373da550dc247797e446a13936e80
parent 6640f6be412e7454bfa7d457670e83aba46ea28c
parent 7ae93b1d0cd1eb43b5fc8248dfc2703608a461f3
author Alex Klyubin <klyubin@google.com> 1395682451 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395682451 +0000

am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParameterImpl API."

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