diff options
| author | Marco Nelissen <marcone@google.com> | 2011-06-15 08:33:09 -0700 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2011-06-15 08:58:38 -0700 |
| commit | dd729fc173fdb9f4e7b95334b2715048602e868b (patch) | |
| tree | 2bec06355ab419e7a2a9dfee166cab7980866ea9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 48014c7082bdee9d2a65cf27c54e73b0aa726fab (diff) | |
| parent | 907dfec02de9f6386d13351e974cda99160394c5 (diff) | |
resolved conflicts for merge of d027329c to gingerbread-plus-aosp
Change-Id: I169c415bf998b9935ab36812511573db05717b91
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions