Kenny Root 67f7d8fbd5 am 6c042b6d: am a5a2de55: Merge "Add ALPN support to SSL socket factory" ...

* commit '6c042b6d678edea0f936da994f85ba62f9a1950e':
  Add ALPN support to SSL socket factory

2013-06-27 14:55:41 -07:00

..

java

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

2013-06-27 14:55:41 -07:00

jni

am 11cd57ca: Merge "Avoid unnecessary FindClass("java/lang/String")."

2013-06-17 18:21:41 -07:00

res

am f6ec3048: am e6cb43a1: Merge "Rename Google Talk to Hangouts in framework" into jb-mr2-dev

2013-06-27 14:52:37 -07:00

tests

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

2013-06-27 14:55:41 -07:00