diff options
| author | Eric Fischer <enf@google.com> | 2011-06-06 12:57:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 12:57:14 -0700 |
| commit | b0387cd209349887ff284ac279657246b15ec8d9 (patch) | |
| tree | 23f458f7b2bf07089e03934403762efdce4f4e3b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6f027fecc10bfef4f8204e1ab2c84c1f456bc728 (diff) | |
| parent | f89c33c4d1e97a7b81a02098264a97dc8a987d04 (diff) | |
am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions