Merge commit '245eaeedf873c5c60e1ad442d2290c108336fb67' into eclair-mr2-plus-aosp * commit '245eaeedf873c5c60e1ad442d2290c108336fb67': Do not deactivate the proximity sensor until after the sensor returns negative.
Merge commit '245eaeedf873c5c60e1ad442d2290c108336fb67' into eclair-mr2-plus-aosp * commit '245eaeedf873c5c60e1ad442d2290c108336fb67': Do not deactivate the proximity sensor until after the sensor returns negative.