summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-04-14 14:29:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-14 14:29:19 -0700
commita14b513ce84e72eaa493bbf7843a0542d43f6262 (patch)
treea3402cd0e7a2da9b63a6ca702bb7d9c8533bf223 /opengl/tests/gl_basic/gl_basic.cpp
parent45931cdaa73b4e793e1a91e22e4bb5e12b96854d (diff)
parentba4aa67bebc4cff52c2b7ebb63edef57e15ddcd3 (diff)
am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'b590ca85afba6b886cc995e9a6092457174ea016': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions