tree 53dc25df0d85b09ae3e3643d8d98fa1b3a318f29
parent 381fb8bdd10e6426f829e90f57686103529adb77
parent 4ef6c9b6a16c9b65699705aaa64977fc60dd3331
author Kenny Root <kroot@android.com> 1359151732 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1359151732 +0000

Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."