tree 40246ba7ef169f97dff65bf771d5a1e7372ca9a4
parent 6fa8888254deb4961dc64c6ac03dc103c9cd8bcf
parent 0c39b6c65bcb96ed6438c7d792a67708409d8f0f
author Joe Onorato <joeo@google.com> 1280337399 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280337399 -0700

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.