diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-18 09:52:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 09:52:18 -0700 |
| commit | 762ed0e482a975b56d435f8a35c5b8f1f94a041e (patch) | |
| tree | 384bd709bfdad1b99e928efef531b47d16a3d8f3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f066f6cffe1f6757174f5c26e49ef6fc5524e3d5 (diff) | |
| parent | 4664d07374ce87922eeb61edd26e2487d6c4e869 (diff) | |
am a38762f3: am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit 'a38762f340853cca5a07732c21e9fb816fd252b8':
MOTOYA changed two kinds of Japanese font files.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions