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