summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@android.com>2010-09-06 19:43:44 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-06 19:43:44 -0700
commit7e9e7a44d21aa2a08905d9467cb19631bbd87558 (patch)
tree365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp
parent737705891626065aa63da056dcf22ef47b3276e9 (diff)
parent1f92dbb42475c3b1d5901a9286516e581e45216e (diff)
am 32e29851: am 612ff274: Quell annoying Java ascii/unicode warning.
Merge commit '32e298511a31160868f7303dbf9a1910099c0b57' * commit '32e298511a31160868f7303dbf9a1910099c0b57': Quell annoying Java ascii/unicode warning.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions