summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorRobert Greenwalt <robdroid@android.com>2010-04-26 15:47:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-26 15:47:28 -0700
commit349397e744283ed1c52a139404a3b33ff38140d6 (patch)
tree0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp
parentc34c748ffd2f9613849ab0156d6dafefe179c51e (diff)
parent573828c96fad71b0616b5af041df6609e0c6dcaf (diff)
am b3444560: am 27fba679: Fix Throttle reset.
Merge commit 'b344456083a4fa3911ebf58c73f022827cc073eb' into kraken * commit 'b344456083a4fa3911ebf58c73f022827cc073eb': Fix Throttle reset.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions