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