Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

This commit is contained in:
Jim Miller 2012-01-10 10:28:21 -08:00 committed by Android (Google) Code Review
commit 2f6fcb2893

Diff Content Not Available