diff options
| author | Eric Fischer <enf@google.com> | 2011-03-29 14:15:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-29 14:15:22 -0700 |
| commit | 2ffee604fa425acf0173ec632dc065d6b69e1b14 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 533b7eb13ce40a6caaeb97a20890a1358e81de8d (diff) | |
| parent | 270c1a567d812290f1c33e15d56b148b073c4f77 (diff) | |
am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions