am e2d76314: am 9b518d93: Merge "Fix issue #5642121: Proximity sensor didn\'t turn the screen on in call" into ics-mr1

* commit 'e2d76314cdd64cc69c791af0ee2fd2bbcc0425ba':
  Fix issue #5642121: Proximity sensor didn't turn the screen on in call
This commit is contained in:
Dianne Hackborn 2011-11-29 10:20:03 -08:00 committed by Android Git Automerger
commit 8f74c9980c

Diff Content Not Available