tree 384a5df6360d7e7db540597eff04cbd6660ea968
parent ec81bb5db6e5c946848c73ec0e5160537ffe8efc
parent 7d0d1c560d28591b4533ee1bfe830a6ec535f697
author Alex Klyubin <klyubin@google.com> 1390420146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390420146 +0000

am 7d0d1c56: am 38866e37: Merge "Test default config of SSLCertificateSocketFactory."

* commit '7d0d1c560d28591b4533ee1bfe830a6ec535f697':
  Test default config of SSLCertificateSocketFactory.