Merge commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30' into eclair-plus-aosp * commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30': Don't require WAKE_LOCK permission to enable wifi
Merge commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30' into eclair-plus-aosp * commit '4492bcd8b0437b1200e93c001ca75d9fa8c4ad30': Don't require WAKE_LOCK permission to enable wifi