tree 6e2a5b9becc6eaef5f8658323b1851ee07d86156
parent 3455cba6072f92e546d5b49cb776d31fc02f442e
parent 89369172f773a01d146fad9c3a8360b21073f2e5
author Dianne Hackborn <hackbod@google.com> 1322590803 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322590803 -0800

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