diff options
| author | Eric Fischer <enf@google.com> | 2011-12-09 14:58:10 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-09 14:58:10 -0800 |
| commit | 1136e9bc2ae4a63450b79953b18edf4dba436e7e (patch) | |
| tree | 8cef08e323746a2ae01800c70e083ad67d7fcb9a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9c31b9e7238740da1f803b29cb3479ce14d549ee (diff) | |
| parent | 1da214b25ac30791b5b938cef2c1e91d0b42f7ae (diff) | |
am 8430094c: (-s ours) am ab6b816a: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '8430094cd9ecfcb932014ed5ae2d3db095bc7382':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions