Commits
Jim Miller authored and Android Git Automerger committed 5437c220e23M
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
Showing diff tod3872f55045