| commit | 2a5db6d4b389a1fb24f43f18b4207a5fad5296ca | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Jul 30 12:18:58 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 12:18:58 2010 -0700 |
| tree | 1b2b9d421a19c1c3595e6569580adf5f05c5659d | |
| parent | 6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7 [diff] | |
| parent | 432c5b6c1d4181194cb82a14107b6d10105231a9 [diff] |
am 432c5b6c: am 7f9fe5fd: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo Merge commit '432c5b6c1d4181194cb82a14107b6d10105231a9' into gingerbread-plus-aosp * commit '432c5b6c1d4181194cb82a14107b6d10105231a9': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.