OSDN Git Service

am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power...
authorJim Miller <jaggies@google.com>
Tue, 10 Jan 2012 18:34:51 +0000 (10:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jan 2012 18:34:51 +0000 (10:34 -0800)
commit0b0a5dc8aae66555b03afa2860e780f8a69f0904
tree34a2badff01e4bc942327a56268c62909aa7ccbb
parentfc86e54538a82c1e7f763ca39775c99bd95ff8ac
parente597102c47ca39ac36f24e8642fbbde3bd48a7dd
am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

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