Commits
Mike Lockwood authored and Android Git Automerger committed 1738c5f7faaM
am 57932798: am db0ec648: Merge change I85572973 into eclair Merge commit '57932798cf11d72e656fd6e315b83e2c571cd129' into eclair-mr2-plus-aosp * commit '57932798cf11d72e656fd6e315b83e2c571cd129': Do not show keyguard if screen is turned off by proximity sensor.
Showing diff to5b325098f50