diff options
| author | Shin-ichiro Fukuda <s-fukuda@motoya.co.jp> | 2010-09-21 20:21:48 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 20:21:48 -0700 |
| commit | 43374b8e7344814c0f8b80ba5e15d7dc2ce7ec34 (patch) | |
| tree | f92fd8706fefdc57e45eb5eae96380d8ee41afc5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d0c74812f522ffbcbbc7ea67bf2285b1f3da72f1 (diff) | |
| parent | 90ffd1462da9c0ca8b490bdd6ed7ae0cbaeeefe5 (diff) | |
am 5144594c: (-s ours) am dd62a056: DO NOT MERGE. MOTOYA Japanese fonts
Merge commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc'
* commit '5144594cc1e945eaf58b6ed66d26d7a1b7985afc':
DO NOT MERGE. MOTOYA Japanese fonts
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions