diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-03-17 16:21:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 16:21:20 -0700 |
| commit | c8f07bae1fb0a690d95008e18797aaefd58c4f62 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6dd337b9f1c7cc49ca2ad6443adb4b3fcfe11fe0 (diff) | |
| parent | 2d0c7bfc6aabd6fe700ee609a7392d162bdfc8ac (diff) | |
am c7c8c599: Merge 67450db0 from honeycomb. Do not merge.
* commit 'c7c8c599a636a105db0d2eac3b8b332532a7a40f':
Merge 67450db0 from honeycomb. Do not merge.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions