diff options
| author | Eric Fischer <enf@google.com> | 2011-10-31 12:26:51 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-31 12:26:51 +0000 |
| commit | 240544cbff54e2a99292c5c89f29310e3c9a6d17 (patch) | |
| tree | 1d90b398fb949e1e316b658c863f2f87f7814afb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f5a0141306e8fcc307476b1dd3132562b641254e (diff) | |
| parent | 1e6a30e6bd6b6f1bc3b46051c7828fef7580bbdd (diff) | |
am 94e08f40: (-s ours) am 2cc1c5d0: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '94e08f40936b6a280f404e8b67cb5ef900747258':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions