Commits
Mike Lockwood authored and Android Git Automerger committed e9b89add4daM
am d1fc1c07: am 57932798: am db0ec648: Merge change I85572973 into eclair Merge commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84' * commit 'd1fc1c077b96b1f7f7a58318bd2fc2449315ed84': Do not show keyguard if screen is turned off by proximity sensor.
Showing diff tof196882a254