diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 07:41:59 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-17 07:41:59 -0700 |
| commit | c9fe8110e0a343c832bbd5c57431d32b8a308ba2 (patch) | |
| tree | 9278fdc3b1af458be41b3f06a1a86b707655fbc7 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7eea57b675893e001a006aa39ea2852c626e83ce (diff) | |
| parent | e02856c0f90f74cf03353b39a654c286b5100584 (diff) | |
resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp
Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions