OSDN Git Service

Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
authorJim Miller <jaggies@google.com>
Tue, 10 Jan 2012 18:28:31 +0000 (10:28 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Jan 2012 18:28:31 +0000 (10:28 -0800)
commitaf48709993faeb0d3665eb6a491aaec701e1ccd5
tree38ea171a6a6a65f38bf32c45a57643226eef80cc
parentaaff44c84f4e88184276064dff9e36eefde3ffcb
parent071742d838f9b0c312af309c87eaf2c444aeeab8
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1