diff options
| author | Eric Fischer <enf@google.com> | 2011-05-10 14:23:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-10 14:23:46 -0700 |
| commit | 60490cc70a3a774ce0ca1f5b161ccd4f8060529f (patch) | |
| tree | ca71c6d33946a3c1ca9f2d1e73b0322d401ba3d9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 04de9afdc5c3f33e2307618a09d653522898b458 (diff) | |
| parent | bfa17d2e4afe75b99aa8da3e7c510f60ccb14f80 (diff) | |
am 270fbfed: am 37259203: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '270fbfede58e4971588755adfa7e70e0de07b8cf':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions