summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-06-11 17:00:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-11 17:00:47 -0700
commit7918c38542f535430689854e1c2970a10f07eea6 (patch)
tree148065c8ad7acd5ff445c1e7af5f5188f8c06a33 /opengl/tests/gl_basic/gl_basic.cpp
parentdb755988991e476a707875740c149890d1bb58d1 (diff)
parent6c424e2fb159a52818504410a8c5229e595f12e4 (diff)
am c59793e1: am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit 'c59793e13146d81daec912d1fb91cff9c958e04b' * commit 'c59793e13146d81daec912d1fb91cff9c958e04b': Doc change: remove pdf summary of guidelines from templates archive.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions