am e7e0a072: am 4dca3946: am df1498dc: am bf043b50: Merge "Add TLS Channel ID support to SSLCertificateSocketFactory."
# By Alex Klyubin
# Via Android Git Automerger (3) and others
* commit 'e7e0a072':
Add TLS Channel ID support to SSLCertificateSocketFactory.