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)
commite597102c47ca39ac36f24e8642fbbde3bd48a7dd
tree485b152b97bf8321fdd223f35587bb4294672be8
parente846922266c143ab81a3793e6e718ff9a0f3fc58
parent2f6fcb2893abeae709824c51f60bca892ae7ec17
am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

* commit '62fad7689567bed6ec372401c1b171659c28572d':
  Fix 4560303: Add setting to lock later when power button pressed