OSDN Git Service

am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair
authorIrfan Sheriff <isheriff@google.com>
Wed, 20 Jan 2010 21:30:17 +0000 (13:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Jan 2010 21:30:17 +0000 (13:30 -0800)
commit6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520
tree3191fa2c7bd3502b86cd96b3dd18809d7ef202c0
parent8c48b4a532b1011a2f76f3565335c77fc5b141b3
parent48ef378d01b3ace349cbb6ba564276b854d872c9
am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair

Merge commit '48ef378d01b3ace349cbb6ba564276b854d872c9' into eclair-plus-aosp

* commit '48ef378d01b3ace349cbb6ba564276b854d872c9':
  DO NOT MERGE Avoid wifi disable in a UNKNOWN state