diff options
| author | Eric Fischer <enf@google.com> | 2011-06-16 09:31:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-16 09:31:53 -0700 |
| commit | 7c9f3ff3d3b672d1d45cf75df89c590710d8b9a1 (patch) | |
| tree | 02a86dc22485fd8ce11695a5684f670154c34610 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 073b890d9dadf9017134cc18b33f4f9a274b2cf4 (diff) | |
| parent | 9662a00232e5c85b5b9ffe235661ee87b3017c9d (diff) | |
am a5608e3a: (-s ours) am c0e84cf3: am 5e451faa: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'a5608e3a67a86f55e8c5ce971934f32c398f2525':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions