diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 17:45:45 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-10 17:45:45 -0700 |
| commit | ef3270ad6905ab472559f7f0f4bb7aa2b3b5110a (patch) | |
| tree | ad74275b0da46e9af42f696d14416cad3e96cb8b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 20d7f36a4067c5135304fb77ea8d8c92cc68f975 (diff) | |
| parent | 2d97f3e5905dffc3cad4b4cfd46bbc1050196d7f (diff) | |
resolved conflicts for merge of c2894474 to gingerbread-plus-aosp
Change-Id: Ie00785e37809b677d6e8ab44c47e1f26037793d2
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions