diff options
| author | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
|---|---|---|
| committer | Jake Hamby <jhamby@google.com> | 2010-09-30 16:29:13 -0700 |
| commit | 8c14ddd7bc6da11c44acf0c866ef17126fb0afbf (patch) | |
| tree | 75d47cdcbb7eadf0f96aa8203158ca157cc4a260 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 50763119563ce2e6c7c26eb851fc9ddf0fee5b9d (diff) | |
| parent | 514c70a790f8ef8eec5797ba438cd0ced4a38022 (diff) | |
resolved conflicts for merge of 0a972acf to gingerbread-plus-aosp
Change-Id: Id8dc5038edc214b4433bdf690243f2f5fe5b4812
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions