tree 17b4b81cc0db7eace6342ca1e7de5c1b8cdf0ee0
parent 24651682edaf71e8a826f23a7ea09bc97c8072c4
parent 468c82e4be0630de04a50d88602cd8c6bc745962
author Andrew Stadler <stadler@android.com> 1279172022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279172022 -0700

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

Merge commit '468c82e4be0630de04a50d88602cd8c6bc745962' into gingerbread

* commit '468c82e4be0630de04a50d88602cd8c6bc745962':
  Skip hostname verification when using insecure factory