summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-11-03 00:04:10 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-03 00:04:10 +0000
commit13544d066891e3d2f62da735453851dd05364610 (patch)
tree0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4 /opengl/tests/gl_basic/gl_basic.cpp
parent4dd25d247371d848d0e6ff922086846ef8d82f2d (diff)
parentd6474254b8b45ec0183e108652ed710d7f94496d (diff)
am 8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '8c49b81b5971c3fd254c4ecd862d1a32b1917edb': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions