OSDN Git Service

am 57932798: am db0ec648: Merge change I85572973 into eclair
authorMike Lockwood <lockwood@android.com>
Fri, 4 Dec 2009 00:32:16 +0000 (16:32 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Dec 2009 00:32:16 +0000 (16:32 -0800)
commitd1fc1c077b96b1f7f7a58318bd2fc2449315ed84
tree17371d2b43ae671fc6535030f734fca383945d43
parente0c42dae95fd6bc6605875d697e105fa0dbdd0a0
parent57932798cf11d72e656fd6e315b83e2c571cd129
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.