diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-10 11:29:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-10 11:29:10 -0700 |
| commit | 13c2d16ed6c1840c51185cec7b682e6649425940 (patch) | |
| tree | 9a7df8ac6775e0425ea28e429e271d85701b7710 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0d1598c92734c3bfabbfa356c04cad51d0fc6609 (diff) | |
| parent | 57cbf0857f1bf91310302de27c7050aa08acdbfa (diff) | |
am 09f1e2b2: resolved conflicts for merge of 56aa3c76 to gingerbread-plus-aosp
Merge commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373'
* commit '09f1e2b2151ea18c05b9138a0a5cb63af18ea373':
Initial contribution from Sony Corporation.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions