diff options
| author | Kenny Root <kroot@google.com> | 2010-10-18 10:31:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 10:31:51 -0700 |
| commit | 4380529a0bb729f46730d2ad6f1f3e0536c75394 (patch) | |
| tree | e3769d4056e98754d7f421575de730e460567a6c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ace3dc4f7cda6b7211b3bab4f33dff8948477791 (diff) | |
| parent | 7af9676611fb73d78969e28bbda5c3331f53f297 (diff) | |
am 097ea0bb: (-s ours) am dc83fd5a: Merge "Import revised translations DO NOT MERGE" into gingerbread
Merge commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43'
* commit '097ea0bb508e3c6e9253e3c50dc9a6704681ce43':
Import revised translations DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions