diff options
| author | Eric Fischer <enf@google.com> | 2011-03-29 12:30:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 12:30:12 -0700 |
| commit | c2cb14c6c0db3bc720fea9d477b4be702daf9321 (patch) | |
| tree | 54764d9883129c005433151be8d41c0e2949f767 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ccec7a73a4e58d7e448547db9f8c5ca51c38dced (diff) | |
| parent | 711b114c19bec6f0e8eacfd5f0924ed8b56776e8 (diff) | |
am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions