diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-04 16:26:42 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-04-04 16:26:42 -0700 |
| commit | e9e3d1dec208546ac145022b6a1d11f5a55e9973 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9319fc55df0567f13af6207feb4a828bb90adcdd (diff) | |
| parent | 8e5a5361d37ad7d963217d93c9fae32bc819c161 (diff) | |
resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp
Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions