diff options
| author | Eric Fischer <enf@google.com> | 2011-03-29 16:59:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 16:59:35 -0700 |
| commit | b6d2b82685f223224aaf0106fc06435ca7931aff (patch) | |
| tree | c5f8a8a33f92afdaee23ade77eba54f396ce1e1c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 848b96b8411d0a95c75e63aebd9fc58f06ede5dd (diff) | |
| parent | 00743cc67f43ab575ed5429686f34d575175a76e (diff) | |
am c9e5464b: (-s ours) am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'c9e5464b06aa6abb8db60094483a0d353515fb67':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions