tree 69a09052f1c2ca430597a5563b3dc586f86fab38
parent 9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171
parent a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf
author Kenny Root <kroot@google.com> 1372369937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1372369937 -0700

am a5a2de55: Merge "Add ALPN support to SSL socket factory"

* commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf':
  Add ALPN support to SSL socket factory