diff options
| author | Eric Fischer <enf@google.com> | 2009-11-13 17:46:31 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-13 17:46:31 -0800 |
| commit | b52c304072e20377b933bd78f6919c004c59c039 (patch) | |
| tree | 2b8cba36aa100fbd6b22ed3a2036d9fb168599d5 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d4482fb6c70a8674d5c71ea3252e51c7a80026d3 (diff) | |
| parent | ed83aa2fc713527cdcfa0da07cf98b4716546e82 (diff) | |
am d12ba5e0: (-s ours) Merge change Ibd5b099c into eclair
Merge commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9' into eclair-mr2
* commit 'd12ba5e04b1cf82c0dd7f8bcf76cdf0b773b09a9':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions