diff options
| author | Justin Ho <justinho@google.com> | 2012-02-10 10:51:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-10 10:51:52 -0800 |
| commit | d0a31838fcb878c068f85c82946248e98eb0ad24 (patch) | |
| tree | cc601c2c420c5235b4e1526d29509c568f4eb13e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5414a714b1624774484882e08edd59a3b25ec30c (diff) | |
| parent | a01f83fe163076d470a82add70a43898d62ccc41 (diff) | |
am 25d1d268: (-s ours) am 0fc225ed: am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '25d1d268c1b00734f4bdd7fcb85ced97645a7f29':
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions