diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-11 09:38:10 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-11 09:38:10 -0700 |
| commit | 0ace3f4b92aa2d98341e5708835f7c9af0837af5 (patch) | |
| tree | ad74275b0da46e9af42f696d14416cad3e96cb8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1d83ed6b4e0008539c17fd3fc8680cdfd6b188c8 (diff) | |
| parent | 56150037c7bab8ef4ba3e26a26e498c35e1a612b (diff) | |
resolved conflicts for merge of e3cfd35b to gingerbread-plus-aosp
Change-Id: I2f90572163e7cb98e4e2762998a2ac63cc267dea
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions