summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-06-11 16:58:34 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-11 16:58:34 -0700
commit6c424e2fb159a52818504410a8c5229e595f12e4 (patch)
treeba7baa1cbc2a4ab93b7523a90df9c8b132aab577 /opengl/tests/gl_basic/gl_basic.cpp
parent13387dbf95917eef99918a87e01a6e727bc20df3 (diff)
parentd5fd97c70b23f65e4135dff7187b83f549773e4b (diff)
am 3a010fa6: am 1067e689: Merge "Doc change: remove pdf summary of guidelines from templates archive." into froyo
Merge commit '3a010fa6192f09121fc920810c5a8366b5b09f46' into gingerbread-plus-aosp * commit '3a010fa6192f09121fc920810c5a8366b5b09f46': 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