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