diff options
| author | Andreas Huber <andih@google.com> | 2010-07-30 12:15:02 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 12:15:02 -0700 |
| commit | 432c5b6c1d4181194cb82a14107b6d10105231a9 (patch) | |
| tree | a134148c3f13d24f3aca4ebc574899669d3efa63 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 154a320069a316491c25b716f2aeea8c51a758e8 (diff) | |
| parent | 7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6 (diff) | |
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 '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6' into gingerbread
* commit '7f9fe5fdfab8dbfffb279ae1687361ca1d939bb6':
Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions