diff options
| author | Eric Fischer <enf@google.com> | 2011-11-21 21:08:20 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:08:20 -0800 |
| commit | 53d42cb7d3c5c35b63363abbe9c44b8f6961afd4 (patch) | |
| tree | e7e658064f338ef775df41dd4b285bfdde28d9ca /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 98c54a3e06c3e1909fa0f6cb19c5201f116ed5bc (diff) | |
| parent | 281d1072b4d880f70016d4553c7fcc25c00c89d3 (diff) | |
am 281d1072: (-s ours) am 68f0d47e: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '281d1072b4d880f70016d4553c7fcc25c00c89d3':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions