tree 0dcc0ae73f47ad3e2311fd25a9d96ebcf1ed052f
parent 60b02cab9cba74e4fe1fcbe64af85ed867d20cf9
parent 11505b474b16457fb65952aadba0609cb33de8e7
author Xia Wang <xiaw@google.com> 1273187558 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273187558 -0700

am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not a common user case." into froyo

Merge commit '11505b474b16457fb65952aadba0609cb33de8e7' into froyo-plus-aosp

* commit '11505b474b16457fb65952aadba0609cb33de8e7':
  Avoid UNKNOWN state for Wifi in bug2542613, not a common user case.