diff options
| author | Jake Hamby <jhamby@google.com> | 2011-06-07 16:24:15 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2011-06-07 16:24:15 -0700 |
| commit | ca1df0ccac686427880a1d29e8a12ae166753f9b (patch) | |
| tree | c790c5fc8fa491fd5310bfe40fd410317fc45515 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c7492c07b4103e326ba24b709ffa2eacc7d3c302 (diff) | |
| parent | df2590212745ce3beea59a2d5e6fc53ca64e4bd4 (diff) | |
resolved conflicts for merge of 66040bbb to gingerbread-plus-aosp
Change-Id: Id13750bc01c977ab06accf8ceabc95fe5dee703a
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions