summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2011-11-17 21:04:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-17 21:04:37 -0800
commit019837205edc48f97e7485665c6070be7519a0c6 (patch)
tree5541ff6c50c77ceaec3600826032470fc9cf0584 /opengl/tests/gl_basic/gl_basic.cpp
parent32f4fe562649f00837453cffd7930fe82d4d789c (diff)
parentba7232c6b33fa32c62e230e1e3eb94023c2e3836 (diff)
am da0e7b0c: Merge "Tie screen saver to the screen off timeout." into ics-mr1
* commit 'da0e7b0c7a0bb1f9f972c3ed042b8cd752031046': Tie screen saver to the screen off timeout.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions