diff options
| author | repo sync <fredq@google.com> | 2011-03-22 11:47:39 -0700 |
|---|---|---|
| committer | repo sync <fredq@google.com> | 2011-03-22 11:47:39 -0700 |
| commit | 622c97d7695739844077fe6e76dfc080ace60a47 (patch) | |
| tree | 2aa2cb6936c908494527967d2b865eaf6392b787 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 1bc4e51040dffcfa2038f79ff952b2b72353beeb (diff) | |
| parent | 3a3926ac519e52c086226523f3608eb776ab9955 (diff) | |
resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp
Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions