am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity...
am 08710dcd: Merge "part of fix for [3004226] Cannot end the call - Proximity sensor doesn\'t work" into gingerbread
Merge commit '08710dcd' into gingerbread-plus-aosp
* commit '08710dcd':
part of fix for [3004226] Cannot end the call - Proximity sensor doesn't work