diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-21 10:45:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 10:45:09 -0700 |
| commit | 78bc57e5c953f58699238bae6f6b11def2eabbc7 (patch) | |
| tree | ec4e1fe7ceb1ade1ee4dde94bac31bca50cb04cb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5355b02be1848ece6a1c74eec32ce6f16d85f337 (diff) | |
| parent | 808a411945246f0d15e2392549919bb6b4df51c3 (diff) | |
am 925f94b7: am 7869f08c: Merge "MOTOYA Japanese fonts"
Merge commit '925f94b788f5856025aa8218ee2e705c14f58281'
* commit '925f94b788f5856025aa8218ee2e705c14f58281':
MOTOYA Japanese fonts
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions