tree 1c0484c18314681ceb9d1ae7ef4cd08985fa056f
parent 9f0a386e99785c092b90e0b40fe6bfcff3b74c8e
parent 77ad6d4e226855f9a660f09d71dad6c060948a8b
author Brian Muramatsu <btmura@android.com> 1297381612 -0800
committer Android Code Review <code-review@android.com> 1297381612 -0800

Merge "Change SSLCertificateSocketFactoryTest.testCreateSocket host" into gingerbread