tree 52d08c51e480e2501073f7c9a86727ea57f91beb
parent 97351eb43d413220212e95fe63a1ec29aabb77a6
parent 799044f32079eea8e057afda4d07b173db5da4d8
author Brian Carlstrom <bdc@google.com> 1377552404 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377552404 -0700

am 799044f3: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev

* commit '799044f32079eea8e057afda4d07b173db5da4d8':
  Change SSLCertificateSocketFactoryTest to use googlemail.com