diff options
| author | Eric Fischer <enf@google.com> | 2011-02-08 10:46:24 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-08 10:46:24 -0800 |
| commit | a122c27b91420c25ab5304c64e9450a2fbb8f977 (patch) | |
| tree | 55c3aa1bb64fb7d5886dcfeeae34ffad7206e34d /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | db1807ff0509433399ab76e2871c55632b089bc5 (diff) | |
| parent | 3f15d63b99eaad029abea464665430ac69a73313 (diff) | |
am 1e09ca2a: (-s ours) am c7bece13: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '1e09ca2a1f3e9ce2dbe538c0fbedb687c3f5738c':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions