OSDN Git Service

am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed...
authorJim Miller <jaggies@google.com>
Tue, 10 Jan 2012 18:30:41 +0000 (10:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jan 2012 18:30:41 +0000 (10:30 -0800)
* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed


Trivial merge