| commit | 6c042b6d678edea0f936da994f85ba62f9a1950e | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jun 27 14:52:17 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 27 14:52:17 2013 -0700 |
| tree | 69a09052f1c2ca430597a5563b3dc586f86fab38 | |
| parent | 9d2b0dbf67844ead1a0aeb22e1e3097d2ec60171 [diff] | |
| parent | a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf [diff] |
am a5a2de55: Merge "Add ALPN support to SSL socket factory" * commit 'a5a2de55082b1f2a9ec0b99962a88063ac6d1bbf': Add ALPN support to SSL socket factory