diff options
| author | Eric Fischer <enf@google.com> | 2011-02-23 15:38:38 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-23 15:38:38 -0800 |
| commit | edcb876cdcc822d564471f4f74d75088c7cbb780 (patch) | |
| tree | 12cdc0f1be3884443d5c93130fb49cd405cbfa64 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e364df5a5a2cc1536a04f77ad17ae5b7266e8a18 (diff) | |
| parent | d189adf1bfa74be59ae1321f7a542d3f96a1b5a4 (diff) | |
am bb0c1a36: (-s ours) am 32751e31: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'bb0c1a366dab54f20c8aded19ca01fe3d8721de2':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions