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