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
This commit is contained in:
Jim Miller 2012-01-10 10:34:51 -08:00 committed by Android Git Automerger
commit 0b0a5dc8aa

Diff Content Not Available