diff options
| author | Justin Ho <justinho@google.com> | 2012-02-10 10:09:42 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-10 10:09:42 -0800 |
| commit | f68eb209240d5742bbd8e38beea4a5cb64ed59ef (patch) | |
| tree | 62ae95e5606b65456e4877a437dfcb3020b7cee1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | e1eb4ca8873a944e9c67ea5601601519e3c54621 (diff) | |
| parent | b96058b1fa0bbdac3e4a3d36b03e05f82636a87a (diff) | |
am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '744c5b0bdee6a26e2dc7e740a695d53c32104326':
Import translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions