| commit | 0b0a5dc8aae66555b03afa2860e780f8a69f0904 | [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 | 34a2badff01e4bc942327a56268c62909aa7ccbb | |
| parent | fc86e54538a82c1e7f763ca39775c99bd95ff8ac [diff] | |
| parent | e597102c47ca39ac36f24e8642fbbde3bd48a7dd [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