summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2011-02-25 11:26:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-25 11:26:13 -0800
commit70cf6e2fafb58c230e4ca8ee06f989869ed0f822 (patch)
treecc2461238e706d03a7db7b8e4b1974f56191ffc2 /opengl/tests/gl_basic/gl_basic.cpp
parent822029f7423679bb582f48760ef5dd9cb7ca6867 (diff)
parent68ca4d3c97c5db2b5703ecc81e1ec076263c2e39 (diff)
am 040f6150: (-s ours) am 9967ce04: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '040f61504aeab1d905ac9fb85945699877e78d4e': Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions