diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:27:16 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-25 17:27:16 -0700 |
| commit | 5c8eb900abde42702e7dd4154a8730e5cc44d46b (patch) | |
| tree | 4ca64e6705104fcfb33576e9aa815f1a29a55c17 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | d6a3b3885f7e623ba04ac49e6a4197d47cf98fcf (diff) | |
| parent | 5ed12f734c418236c03c08afe1c82938ffc28c0f (diff) | |
resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp
Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions