diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-11-22 16:46:18 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-22 16:46:18 -0800 |
| commit | f2854d02e341078cff4f1be6d80293faafe3242b (patch) | |
| tree | 2ec012fa06311ad0e6b94c9161848be293a3a0fe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bfba13c13b47bdff18d9a37fa236fbfe893277c8 (diff) | |
| parent | dec491cf02f1eacedcf9ae0e364783859da28462 (diff) | |
Merge "resolved conflicts for merge of 8484e57f to master"
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions