| commit | e597102c47ca39ac36f24e8642fbbde3bd48a7dd | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Jan 10 10:30:41 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jan 10 10:30:41 2012 -0800 |
| tree | 485b152b97bf8321fdd223f35587bb4294672be8 | |
| parent | e846922266c143ab81a3793e6e718ff9a0f3fc58 [diff] | |
| parent | 2f6fcb2893abeae709824c51f60bca892ae7ec17 [diff] |
am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1 * commit '62fad7689567bed6ec372401c1b171659c28572d': Fix 4560303: Add setting to lock later when power button pressed