diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:54:46 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2011-03-15 11:54:46 -0700 |
| commit | d516c74c42d77e8614fb53fb97161c9f4aeae812 (patch) | |
| tree | ad3cf2304e44d77a583ac28ff560bf9310fffd1a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f17316f2d7c23efb55d0e241cba13d5aa2764aa4 (diff) | |
| parent | fe95159c8e68d4b1f5d3af771595edb7c44bda32 (diff) | |
resolved conflicts for merge of ceae9983 to honeycomb-plus-aosp
Change-Id: Ic677e58dcc182908ae1fde33047b3fda013a37c3
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions