am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when...
am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit '340990a2':
Fix 4560303: Add setting to lock later when power button pressed