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