diff options
| author | Eric Fischer <enf@google.com> | 2010-09-24 11:25:47 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-24 11:25:47 -0700 |
| commit | ff21c935401035ed849566d4fb0ba24db3ade18d (patch) | |
| tree | 3fdaaf7116dea950a9754e000a266c2674b8cfdd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7d20a3917983e236da895aa2b25cf84841614899 (diff) | |
| parent | ff2f5177e1c9b8613f5501b8a38c8c16587aa7cc (diff) | |
am f2af2d92: (-s ours) am 4318ab05: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d'
* commit 'f2af2d924df3d444c9a1bcac9f30e0d05ea5086d':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions