Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp * commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c': Fix for 2137900: Be more conservative about poking the wakelock.
Merge commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c' into eclair-plus-aosp * commit '987477159fb003aaf70c7e3ef17c0830fa8fe39c': Fix for 2137900: Be more conservative about poking the wakelock.