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:21 +0000 (10:28 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 10 Jan 2012 18:28:21 +0000 (10:28 -0800)

Trivial merge