diff options
| author | Eric Fischer <enf@google.com> | 2011-03-22 14:03:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 14:03:13 -0700 |
| commit | 24c1a47cb1038628bddbaf0d10e543195dbd5497 (patch) | |
| tree | fdfb1d10aa4dc4465fadb50c378acdc94e91fd0c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f48444a5beddf9916b2d9e896159793ba77f2bea (diff) | |
| parent | 03a0b0236d56c15057aa0fa6955350418fb0675a (diff) | |
am 17fd0a4b: (-s ours) am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '17fd0a4be9695f644e538e613a145cea3a9b583e':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions