| commit | a608ef359a8ba757dde0e68d6a84c99f4e07727c | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:37:51 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:37:51 2012 -0800 |
| tree | c609fceb1d4aaf6194ed811d5e0a1ec5913722ff | |
| parent | e044e2ce36f9860be2197f2c2491ed35bc99898a [diff] | |
| parent | 5437c220e239dc6276942990bc81c1388cfb176c [diff] |
am 5437c220: am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 * commit '5437c220e239dc6276942990bc81c1388cfb176c': Fix 4560303: Add setting to lock later when power button pressed