OSDN Git Service

Merge change I85572973 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Dec 2009 19:00:06 +0000 (11:00 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 3 Dec 2009 19:00:06 +0000 (11:00 -0800)
commitdb0ec6480b806799f05f3d6fd04d742564af8f2f
tree12567fe448e899138bb302fe820bd40e80f0441c
parent30429ac60e512453d4d7af212788819754b24691
parent4b9ebfa0316cbedb78452607887b554bce9e1317
Merge change I85572973 into eclair

* changes:
  Do not show keyguard if screen is turned off by proximity sensor.