| commit | d3872f55045b7ce7be7dd7ae5fff37d7988bdcb2 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:30:41 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:30:41 2012 -0800 |
| tree | b6715557dd4e7685f05e4b3a49a238437bcbf3a2 | |
| parent | 06e617f5a6f68ca99118268eb7361bb1e5ade0a5 [diff] | |
| parent | 62fad7689567bed6ec372401c1b171659c28572d [diff] |
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