diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-10 09:59:01 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-10 09:59:01 -0700 |
| commit | 733422dbecbf61d1c3a1d6817ce60f2f2f7f0968 (patch) | |
| tree | 2fafaafcb9500dea35f240c5bdec6a6312fac52c /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a81d4d80d6edc3f858b9b4408aeb756529a97475 (diff) | |
| parent | b8232aeb776153af29a925e6a7ec1ce27bd69af9 (diff) | |
am 38645ee6: (-s ours) Merge change 6759 into donut
Merge commit '38645ee6d61368f59b2d83256f2612bdaa38ff49'
* commit '38645ee6d61368f59b2d83256f2612bdaa38ff49':
Do not merge
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions