Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp * commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6': Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.
Merge commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6' into eclair-plus-aosp * commit 'abf7fed21bfa7eb899be558477d928a7c9f3e1f6': Fix more of bug 2290852: Don't wake screen when bluetooth headset is connected or disconnected.