diff options
| author | Eric Fischer <enf@google.com> | 2010-09-30 18:12:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-30 18:12:08 -0700 |
| commit | 3ea86dfb34518f0d5dd6a7ca54da100633355fbc (patch) | |
| tree | 133cdc8d77f2ce4c141dd8e7d2ea861eb04e0982 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c81ed531d384b2506676f74501e4aff805329d8b (diff) | |
| parent | c2b33157f175df7846a3f1a24136f5c27fd9c3fb (diff) | |
am cfba8c03: (-s ours) am 194f5244: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711'
* commit 'cfba8c0337e9a8d55389bcae7caa7a8db230f711':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions