Mike Lockwood a038decb21 am c2912a66: Merge change 25490 into eclair ...

Merge commit 'c2912a662d984e2f23187fa31e7e71122d9472d9' into eclair-plus-aosp

* commit 'c2912a662d984e2f23187fa31e7e71122d9472d9':
  Revert "Don't activate keyguard if screen is turned off while proximity sensor is active."

2009-09-17 11:45:25 -07:00

..

com/android/server

am c2912a66: Merge change 25490 into eclair

2009-09-17 11:45:25 -07:00

Android.mk

…