am 198f049a: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use...
am 198f049a: am 505ce805: Merge "Change SSLCertificateSocketFactoryTest to use googlemail.com" into jb-dev
* commit '198f049a':
Change SSLCertificateSocketFactoryTest to use googlemail.com