diff options
| author | Mike Lockwood <lockwood@android.com> | 2010-10-07 13:55:25 -0400 |
|---|---|---|
| committer | Mike Lockwood <lockwood@android.com> | 2010-10-07 13:55:25 -0400 |
| commit | e36abb1a900128339e8cbe3bde87dd7d92842bd4 (patch) | |
| tree | 84bdf76b4c62e93196d25480e2426d5f09be8079 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5eb1a08163e1d919c4f51cfcd5707dc221f0a93d (diff) | |
| parent | 81833f30599f2ec027a043e1225aaf2cb1ad5d73 (diff) | |
resolved conflicts for merge of 6327a9fe to master
Change-Id: I1a398a7100abf75d8df7ae9a3d6110829645ae64
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions