diff options
| author | Eric Fischer <enf@google.com> | 2011-12-12 15:39:23 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-12 15:39:23 -0800 |
| commit | 84e37b25ca2351b481f5617a29ab8205cea510bf (patch) | |
| tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0f11d886bfd105459c2c1638770be1dc5afe5fea (diff) | |
| parent | 44644a1666df3f43ada5096a529c98eb062bb954 (diff) | |
am f3ea0231: (-s ours) am 386f2084: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit 'f3ea02319fc8d1f882ef7f392c245e197ab858de':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions