diff options
| author | Joe Onorato <joeo@google.com> | 2010-07-28 11:05:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-28 11:05:29 -0700 |
| commit | 6692b0d47b27740fe0a6c97d1b24a4d129fb9a0b (patch) | |
| tree | 7b84d84a9d2b56a07f17e822fd4f78faeebd839a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 10bdb59d41964c95cbc3f4cbec89baba13d1d3dc (diff) | |
| parent | eaa8fbd0bd71527c10d7594a4afaa1fa33e7a2ed (diff) | |
am d3f6c1fa: 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 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188'
* commit 'd3f6c1fa45d0b9aaf467159953ee4bea2ea89188':
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