tree 9d7225ae2dcc00e7a489f4ba7b1da1f4bfa4e545
parent 9382d111bbcbfded9f38c54958d21ad765d26235
parent d14dbcf75e13ab18dac20d7a9d029f7cea71f150
author Andrew Stadler <stadler@android.com> 1279174585 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279174585 -0700

am 521e9aa7: am c98e4311: am 468c82e4: Merge "Skip hostname verification when using insecure factory" into froyo

Merge commit '521e9aa7523220c3dc48f6abd32fad6b76eea114'

* commit '521e9aa7523220c3dc48f6abd32fad6b76eea114':
  Skip hostname verification when using insecure factory