| commit | 96eac19abd7cb3e2a380e5410e28ab972d84b4b5 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Thu Dec 03 11:12:04 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 03 11:12:04 2009 -0800 |
| tree | 7dab3479f6c1de6712658f6afd02b0cd9966ef74 | |
| parent | 646ddf4e077022dcf700d1912ef15590d2e988fc [diff] | |
| parent | ef469c337a6785f6ff92fb4a597faeea9c95097c [diff] |
am db0ec648: Merge change I85572973 into eclair Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-mr2 * commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f': Do not show keyguard if screen is turned off by proximity sensor.