summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorsatok <satok@google.com>2010-09-24 01:37:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-24 01:37:39 -0700
commit4728e30b0a81482aeede8a97056961f16c734fdd (patch)
tree23541fca7168217809dc320991efaad98ec45706 /opengl/tests/gl_basic/gl_basic.cpp
parent29f94578780c6affe50938045267ca296886c8a2 (diff)
parentffe49bf1a1776dad72fd68a204f65aa9a47e88df (diff)
am 933fc94c: Merge "Use MOTOYA font for Japanese font" into gingerbread
Merge commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982' into gingerbread-plus-aosp * commit '933fc94ce1ca4a1ead83dbc2a0f50f7324b28982': Use MOTOYA font for Japanese font
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions