Mike Lockwood 8d7ae8eede am a038decb: am c2912a66: Merge change 25490 into eclair
Merge commit 'a038decb21419c42a70c83a84c3b8ba152524913'

* commit 'a038decb21419c42a70c83a84c3b8ba152524913':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."
2009-09-17 12:19:22 -07:00
..