commit | 4166ed65e3c59f68f44c8ae1d2d55c8d86da1eb7 | [log] [tgz] |
---|---|---|
author | Irfan Sheriff <isheriff@google.com> | Mon Jan 25 06:04:07 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 25 06:04:07 2010 -0800 |
tree | bed32393c104a296796ae56c4d822953d14f9eeb | |
parent | 926426a6d44a091a1f8eac1a733ce37400c70157 [diff] | |
parent | 6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520 [diff] |
am 6b32c0a2: (-s ours) am 48ef378d: Merge "DO NOT MERGE Avoid wifi disable in a UNKNOWN state" into eclair Merge commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520' * commit '6b32c0a2ffd3fe8bf5c290eeecc78fb2e3521520': DO NOT MERGE Avoid wifi disable in a UNKNOWN state