diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-04-11 16:15:54 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-04-11 16:15:54 -0700 |
| commit | b5acb8d716968a39866ac308bdff50eb5c30688d (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cdbe0579a5b911a563d83e53e4c20820dfdf6557 (diff) | |
| parent | decc72dd5184d4cb3f898f30fa0c981acf82816e (diff) | |
resolved conflicts for merge of efa98a29 to honeycomb-plus-aosp
Change-Id: Id5fe9a8cc322a10e1a0b726c33b5dc9091e44701
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions