summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-10-04 17:53:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-10-04 17:53:55 -0700
commitc752ddf0ae01c9bd27815ab3718321e8a0434d5b (patch)
treead0f6e6006ddeb3b24e08d56646d0aa340825607 /opengl/tests/gl_basic/gl_basic.cpp
parent2a877ed73ad3d40e15f9f98162c6c66490c72c53 (diff)
parent085996210ccc84cf3cdebdcf75b6dfdc6e0b7ec5 (diff)
am e91398d1: Revert for 68833 and 68483 which introduced new assets instead of just updating.
Merge commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88' into gingerbread-plus-aosp * commit 'e91398d134256cf9c39677f9b1cd0279b17a6d88': Revert for 68833 and 68483 which introduced new assets instead of just updating.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions