diff options
| author | Scott Main <smain@google.com> | 2011-02-16 12:08:36 -0800 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-02-16 12:08:36 -0800 |
| commit | 82170c428615d899a2f40cf74fd80b71b92b2d87 (patch) | |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 944d50d30d738f510fefef6048e1869fde5c4212 (diff) | |
| parent | ea66537c1709ba2c1547e092c0fff6323ce4ce9e (diff) | |
resolved conflicts for merge of f722cecd to honeycomb-plus-aosp
Change-Id: Iaaa3a3a1231ea0e0b7ad7442cdf664418472f27f
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions