diff options
| author | Xavier Ducrohet <xav@google.com> | 2011-06-28 18:56:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-28 18:56:14 -0700 |
| commit | 80543fa0e9cb0bb65f0c1de8ee47ab0652178f60 (patch) | |
| tree | fcf60e712c8ec063d65d20af892cd7fd3e822c75 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d2c8b65dac9ac9c391622f24157de9acbece3592 (diff) | |
| parent | 73b607f9ce5c91fed6709495c31a5a7878732205 (diff) | |
am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread
* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
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