diff options
| author | Andreas Huber <andih@google.com> | 2010-07-30 12:18:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 12:18:58 -0700 |
| commit | 66fe3306902a9ca60d4e81d4a98fb3ffc60e6cd2 (patch) | |
| tree | 06c991e1b612a9e6517cefbaf13bd492d125c99f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 11472cedc7f5df8197300107a2f0870f1e34ff1c (diff) | |
| parent | f94c59413e93f58048625950c0aafc78ffdc2913 (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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions