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