summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorMaarten Hooft <mthooft@google.com>2011-02-22 14:48:40 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-22 14:48:40 -0800
commit6030f4e0ed15a400fcda08e2d409eea5564c241f (patch)
tree2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp
parent586b7f4690e2c36444d2502b6ff8dae020ddf74c (diff)
parentb36b9f3446c14a9d92d27bf8e2412b89052cc1e5 (diff)
am 62f40c8b: (-s ours) am 99cca89f: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '62f40c8bcf78ac872a01aee8840b808b5aeea1d8': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions