| commit | 5437c220e239dc6276942990bc81c1388cfb176c | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:34:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:34:51 2012 -0800 |
| tree | e7324a7a036e03808450d39970e2586dae43cac8 | |
| parent | 251f0485440cc8202308ce6c00cbc56b207ded55 [diff] | |
| parent | d3872f55045b7ce7be7dd7ae5fff37d7988bdcb2 [diff] |
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