tree 4cf75e9ac68578e0d11eb4ba180a9b53f98c185e
parent 180fd12ac4737a93eb7793f391215da44abf7dca
parent 45d83e91e247d4929d32e429c8001d52ea6df8f7
author Andy Stadler <stadler@android.com> 1277940809 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277940809 -0700

am a3e021d1: am 3b811ae4: resolved conflicts for merge of fb060de6 to gingerbread

Merge commit 'a3e021d12c96d10f758fb6af3b7a05e85d0d8eeb'

* commit 'a3e021d12c96d10f758fb6af3b7a05e85d0d8eeb':
  Explicitly verify certificate hostname on SSL connections