diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 09:53:43 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 09:53:43 -0700 |
| commit | 57cbf0857f1bf91310302de27c7050aa08acdbfa (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1205c8be1b333b23335c744ab63ecf0e4865b8b1 (diff) | |
| parent | afdf77bb9c7a9af48864e37048a42d47a76a9a28 (diff) | |
resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Change-Id: I3d36a665f93f976824592edf35f6d6a205cc7617
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions