| commit | 340990a2d29f566b83dc551e3c5f748c96bd99f2 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:30:39 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:30:39 2012 -0800 |
| tree | 38ea171a6a6a65f38bf32c45a57643226eef80cc | |
| parent | 79ffc669173325e62fdb9f5a1f96fe2a5c3c230b [diff] | |
| parent | af48709993faeb0d3665eb6a491aaec701e1ccd5 [diff] |
am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 * commit 'af48709993faeb0d3665eb6a491aaec701e1ccd5': Fix 4560303: Add setting to lock later when power button pressed