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 | f59f92f1ac33e39a3cba2a060cbf360d4b681a4d (patch) | |
| tree | 3bff43a9256894541d407f8d6ea18ae375b9ca31 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 341ff2b08380fcab0f2313fb4feca732cf70f840 (diff) | |
| parent | 25d1d268c1b00734f4bdd7fcb85ced97645a7f29 (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