diff options
| author | Eric Fischer <enf@google.com> | 2011-04-14 15:04:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-14 15:04:41 -0700 |
| commit | 8d5e34d6809e8a6de6240c2305fb92954b35546b (patch) | |
| tree | c5bf653c619146e8824a565465cc54c0cf7d401e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9da2a5de25420c7a4b4f1598ece16b5d5796d81f (diff) | |
| parent | a14b513ce84e72eaa493bbf7843a0542d43f6262 (diff) | |
am 1bfb2db9: (-s ours) am b590ca85: am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '1bfb2db93514f8ed70d0a02c12d7ce4791d6b336':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions