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
This commit is contained in:
commit
e597102c47