diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-27 13:59:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-27 13:59:57 -0700 |
| commit | 44f57c061a9b0b91bf5465cb17174c07fca212a4 (patch) | |
| tree | 6c43eb4ce620ab4dafe06cd471505693a303a2ea /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 461653aa737f8aefd7a1d37c07de5c6e5a1c046f (diff) | |
| parent | 060c1a8f1ac7a2434d8a8e010a78b82064dea094 (diff) | |
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
DO NOT MERGE. may fix build on some version of gcc
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions