summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-09-21 15:06:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-21 15:06:08 -0700
commit4587031a5a7962d2d43068a0569fc04ba4c312d3 (patch)
tree7d0f7ca035d28794849b31df6f339e41ce6bee2c /opengl/tests/gl_basic/gl_basic.cpp
parentde6ccb920597e2402c0bfd653b5b2271a2abd545 (diff)
parentefed55f569786dc60e966003a67f8023bd1f92f2 (diff)
am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread
Merge commit '34d3aeaf7f5dd744f46220f7730913468256ae9c' into gingerbread-plus-aosp * commit '34d3aeaf7f5dd744f46220f7730913468256ae9c': Add image creator helper script for OBBs
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions