summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorTeng-Hui Zhu <ztenghui@google.com>2011-03-22 13:58:16 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-22 13:58:16 -0700
commit5a158def403b46fb4dd426be4fefed90c6cdcbff (patch)
tree2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp
parent175e5cdd6ef5fa718dc55bbcb278784e0b0ac719 (diff)
parent632de2d17fd1bd3a221d0be70208261765562072 (diff)
am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a': fix for pause when loading
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions