diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-07-27 14:08:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-27 14:08:27 -0700 |
| commit | 3e8143337566a41985d6667034ee766c0ffc5bee (patch) | |
| tree | 945c8c177235a70889660e6334a7f010f6926fb4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 3254987a0694f220631908443fbf9faf8ccd6651 (diff) | |
| parent | fba44526c061882ac8c9d62e794e3102a20fc719 (diff) | |
am 64994077: (-s ours) am c682559d: (-s ours) am 4d21c773: am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"
* commit '64994077347276fba4fe2eb1719c7dd2c2105073':
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