Commits
Mike Lockwood authored and Android Git Automerger committed 8d7ae8eede8M
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."
Showing diff to96e81f98cdb