OSDN Git Service

am 3e6c1696: am 11505b47: Merge "Avoid UNKNOWN state for Wifi in bug2542613, not...
authorXia Wang <xiaw@google.com>
Thu, 6 May 2010 23:31:36 +0000 (16:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 May 2010 23:31:36 +0000 (16:31 -0700)
Merge commit '3e6c1696135f267cc59d050747839c56ce868ef9' into kraken

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


Trivial merge