| commit | 45d83e91e247d4929d32e429c8001d52ea6df8f7 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@android.com> | Wed Jun 30 16:30:32 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 30 16:30:32 2010 -0700 |
| tree | 2ad7e5d50cfa3e7a0f637f6f03b597f51b1006d9 | |
| parent | bb2d3ec63a26ca6fec0a2bc101f29e80ede73631 [diff] | |
| parent | d851af2e8c3c6047229429c245f2509c324b8312 [diff] |
am 3b811ae4: resolved conflicts for merge of fb060de6 to gingerbread Merge commit '3b811ae4c6bff1204bd08921f5debdb3ad1700b6' into gingerbread-plus-aosp * commit '3b811ae4c6bff1204bd08921f5debdb3ad1700b6': Explicitly verify certificate hostname on SSL connections