| commit | 325d1ab157bccb203b526baef366f19bcd7636b0 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:32:40 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:32:40 2012 -0800 |
| tree | 022e97907a9510bd8c23732dc49d038fb2fc6afa | |
| parent | 201896e9838c067102b5ec10f883d84e75ed276c [diff] | |
| parent | 340990a2d29f566b83dc551e3c5f748c96bd99f2 [diff] |
am 340990a2: am af487099: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 * commit '340990a2d29f566b83dc551e3c5f748c96bd99f2': Fix 4560303: Add setting to lock later when power button pressed