diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-26 10:22:58 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-26 10:22:58 -0700 |
| commit | a0410b4b6840c6227a448ef6a5df7b88cad3f863 (patch) | |
| tree | 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8bdc24e308ed275adc522ebf8d9df6bc3a6d7bde (diff) | |
| parent | 91d4d71a04b378a1cda5edd8a0c245f7a612a7eb (diff) | |
resolved conflicts for merge of b237bdb6 to gingerbread-plus-aosp
Change-Id: Ibd9f488a0331c472a852054af5db06f8e7d35e76
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions