diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-05-18 09:46:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 09:46:16 -0700 |
| commit | 4664d07374ce87922eeb61edd26e2487d6c4e869 (patch) | |
| tree | a261cac5a69ebbc5cf717395918b6e0cdf6cd0be /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d6c51aef6b8903ee2d9db3d1ed9f8736844e5201 (diff) | |
| parent | af859fa9ae83e30dab8484bd4aaf5a37d588e020 (diff) | |
am 7ae7d31c: Merge "MOTOYA changed two kinds of Japanese font files."
* commit '7ae7d31c2fb06a5c53e71c9e77fa75c8f5777391':
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