diff options
| author | Eric Fischer <enf@google.com> | 2010-08-10 12:04:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-10 12:04:09 -0700 |
| commit | 32df7de29b875db1eee549f947ced1e0a07c1c8a (patch) | |
| tree | e322e5740941cb092c1291b54ec648b4e1785eb3 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2744dbf11cabcaa95048cdce6debec6180e845d7 (diff) | |
| parent | 20e38dfac6333e8fe456d2083927a86580c1500d (diff) | |
am c7af4c5c: (-s ours) am 605f4027: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a'
* commit 'c7af4c5c5aff84fc70ac4d6e1547197d56a9ee9a':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions