OSDN Git Service

(root) / android-x86 / frameworks-policies-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1d1f81 db0ec64)
am db0ec648: Merge change I85572973 into eclair
authorMike Lockwood <lockwood@android.com>
Thu, 3 Dec 2009 19:09:10 +0000 (11:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Dec 2009 19:09:10 +0000 (11:09 -0800)
Merge commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f' into eclair-plus-aosp

* commit 'db0ec6480b806799f05f3d6fd04d742564af8f2f':
  Do not show keyguard if screen is turned off by proximity sensor.


Trivial merge
frameworks/policies/base
About OSDN
Find Software
Develop Software
Help