tree 52d08c51e480e2501073f7c9a86727ea57f91beb
parent f9fa705fd96320f156b661fd68b2925219636a10
parent d26b802822dd270df2ad6bfd7a611d92a0789ec2
author Brian Carlstrom <bdc@google.com> 1377552842 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377552842 -0700

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

* commit 'd15dd73c1d2e887d53d530c5188539d9a9759a8b':
  Change SSLCertificateSocketFactoryTest to use googlemail.com