diff options
| author | Svetoslav Ganov <svetoslavganov@google.com> | 2011-02-25 12:39:59 -0800 |
|---|---|---|
| committer | Svetoslav Ganov <svetoslavganov@google.com> | 2011-02-25 12:39:59 -0800 |
| commit | 7788d44a5ea26de477efe664235f6a82a485e144 (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 2fcb04e75b45c742e16ee0b02c856bfbe83d725e (diff) | |
| parent | c93b9968b2fef9a6cb4c0cc44dd011b9c34872f7 (diff) | |
resolved conflicts for merge of 66edf2bb to honeycomb-plus-aosp
Change-Id: I687ca9b7873890e3b30da16d5dde6b57ce92f0d6
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions