diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-27 14:01:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-27 14:01:23 -0700 |
| commit | e32af36b39f13a4f1426f97489783188c20e27c9 (patch) | |
| tree | e89a97332605c7ba6f634463cbf320476f05491b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 015be548a90e822194b80c3bd2f4358850c98099 (diff) | |
| parent | 44f57c061a9b0b91bf5465cb17174c07fca212a4 (diff) | |
am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
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