| commit | 9af41be99bcd7d56a80f833c3474f3553afe8240 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Fri Jul 30 12:20:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 30 12:20:56 2010 -0700 |
| tree | 937313fda616ad0d7f1ce6a3db08f422bf2ea1c2 | |
| parent | 0cdabb79a7335cfa718d6cc073facbb07cacfcf1 [diff] | |
| parent | 66fe3306902a9ca60d4e81d4a98fb3ffc60e6cd2 [diff] |
am 2a5db6d4: 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 '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca' * commit '2a5db6d4b389a1fb24f43f18b4207a5fad5296ca': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.