diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-12 08:34:54 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-09-12 08:35:04 -0700 |
| commit | 935dc55ef6b1f2192eeb76bd9e2d8b7f3bc8eca0 (patch) | |
| tree | 3a3e8b93d010e337d289c228cd6109a2ba412d93 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 5b792a2bd8d480171069c9c237eb69ee87fb16e6 (diff) | |
| parent | 1cca244dfe3e1990bf550d85b3665c4af8e3dbb7 (diff) | |
resolved conflicts for merge of 01937f63 to gingerbread-plus-aosp
Change-Id: If4e427d87538477c90f43be7a9733adb8da1c617
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions