am 0d72f7e9: Fix a race condition that could result in the screen being forced...
am 0d72f7e9: Fix a race condition that could result in the screen being forced off indefinitely after a phone call.
Merge commit '0d72f7e9' into eclair-mr2
* commit '0d72f7e9':
Fix a race condition that could result in the screen being forced off indefinitely after a phone call.