| commit | 67f7d8fbd5ad84681fbdfea184ce538c6834896a | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Jun 27 14:55:41 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 27 14:55:41 2013 -0700 |
| tree | 47ae70eab028e805b87ba5d83da4e2ac15a81f0a | |
| parent | 11b249f641163eefbe7ec8582107c4ed5726baea [diff] | |
| parent | 6c042b6d678edea0f936da994f85ba62f9a1950e [diff] |
am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory" * commit '6c042b6d678edea0f936da994f85ba62f9a1950e': Add ALPN support to SSL socket factory