diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-30 12:15:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-30 12:15:42 -0700 |
| commit | 0cdabb79a7335cfa718d6cc073facbb07cacfcf1 (patch) | |
| tree | 937313fda616ad0d7f1ce6a3db08f422bf2ea1c2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1f5b91521b8067a9ca94fad01353eab39be22dad (diff) | |
| parent | 11472cedc7f5df8197300107a2f0870f1e34ff1c (diff) | |
am 6a5ed6aa: am 154a3200: resolved conflicts for merge of 27eecb70 to gingerbread
Merge commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7'
* commit '6a5ed6aa9dc2c8af096aaf1c5f9c932f08b619a7':
fix inaccurate copyrights
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions