summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorandroid-build SharedAccount <android-build@google.com>2010-04-12 16:56:30 -0700
committerandroid-build SharedAccount <android-build@google.com>2010-04-12 16:56:30 -0700
commita54069e21ff0e9ecbc29cf698fd01c24957e61ea (patch)
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp
parent41c04c89b0ea949b9119ce732ef7b1c537b0d552 (diff)
parentb3815412f0b46718330febf8c54a8b67c53b7f51 (diff)
manual merge
Change-Id: I4760b8fd2f4150441dbf15a598a6b44d9af27621
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions