| commit | a038decb21419c42a70c83a84c3b8ba152524913 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Sep 17 11:45:25 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 17 11:45:25 2009 -0700 |
| tree | 8e69e35cb3d9990a8c11eecb6313dbd5062daf79 | |
| parent | 7ce29aa8d466d03ac109601e804edc94ea37a770 [diff] | |
| parent | c2912a662d984e2f23187fa31e7e71122d9472d9 [diff] |
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."