diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-12 13:55:18 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-12 13:55:18 -0700 |
| commit | 8d7f08b538bac23c7c18685771bf7e0e8b6630a4 (patch) | |
| tree | 39302472f4d2e742d5de39b24bf00c2f1f14fb10 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c451fecc23b9fb83d73a42dae02349855e924c46 (diff) | |
| parent | 06996eb1ecdbaa6d4efbadd0326aaa71ce9c1885 (diff) | |
resolved conflicts for merge of 171c83f4 to master
Change-Id: I56a4c1838b17cf40d96763f95df3c84fc86359eb
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions