diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 11:51:31 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-11 11:51:31 -0700 |
| commit | 42b42be2cd47a206af6935b1a834218e3b501791 (patch) | |
| tree | ec2afb48cfbf0958ca5fbc29f6a00b72b9a9ad68 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 41499c01eb75278fc222b9afd32aca99abd08f20 (diff) | |
| parent | 3476cbb432879e05cb9afeeae2605d16b254ff61 (diff) | |
resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp
Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions