diff options
| author | Eric Fischer <enf@google.com> | 2011-04-06 14:18:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-06 14:18:45 -0700 |
| commit | d01e8ab25a1996bcf8b6aa447540063f98b5b2be (patch) | |
| tree | 4424d3b1b7353c13c3d3e6283e1e56d0fcd53078 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1ea9733536138fdd254c06550139b64d6e2f04b4 (diff) | |
| parent | f68b3714a8ca0fdd8d406b34701ee18011cc90ca (diff) | |
am bef09dc0: (-s ours) am ad3bddab: am 9f2f650f: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bef09dc022a57e535232890302ffb5e9c02b7a6a':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions