am 54db99d9: am e3d0c34c: Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread

* commit '54db99d9c71c6989e0c41940c28bd438d29ebf39':
  Change SSLCertificateSocketFactoryTest.testCreateSocket host