commit | eaa8fbd0bd71527c10d7594a4afaa1fa33e7a2ed | [log] [tgz] |
---|---|---|
author | Joe Onorato <joeo@google.com> | Wed Jul 28 10:16:39 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 28 10:16:39 2010 -0700 |
tree | a49d05563de9b9b0a162a3c2f50f003ff4430168 | |
parent | 78fa14462661330f570d1ad38b239eab7541b246 [diff] | |
parent | 9996342da502bff0d4ba83e55ddfffbb88aaf135 [diff] |
am 0c39b6c6: Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into gingerbread Merge commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f' into gingerbread-plus-aosp * commit '0c39b6c65bcb96ed6438c7d792a67708409d8f0f': Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.