tree d160e9691a900866e4be560ba5e8bca3e766a4f2
parent a2ab587545523e22420311f11e77d468bde9a92f
parent e3d0c34cbcd29814492878e54b1c16ea6412f072
author Brian Muramatsu <btmura@android.com> 1297382251 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297382251 -0800

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

* commit 'e3d0c34cbcd29814492878e54b1c16ea6412f072':
  Change SSLCertificateSocketFactoryTest.testCreateSocket host