summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorSuchi Amalapurapu <asuchitra@google.com>2010-04-22 15:57:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-22 15:57:34 -0700
commit7c4f81b0d37a28b90209717e702d3664cbe8a19a (patch)
tree0647a68e25a4a6329cc0572a75dee37b8fd3dc19 /opengl/tests/gl_basic/gl_basic.cpp
parent32aa719772ee56ee187702649e22946e018a25c1 (diff)
parent81f09d8d549c9822957ee423c74dc778dd16c32b (diff)
am a298d6fd: am a2a568e5: Merge "Fix error code when media is filled up." into froyo
Merge commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f' into kraken * commit 'a298d6fd2a920e8ff2dfd5fd03a2f95cbce5451f': Fix error code when media is filled up.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions