tree 98f63c0ca82ba9f2eee4cdebeddaa966c0831431
parent 64c83cfb6a5b6d23a96e8ba618d7be08f18bbdb0
parent 363809c71da861e9f4694b047054d79c534a02d3
author Xia Wang <xiaw@google.com> 1273188696 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273188696 -0700

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

Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken

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