diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-02 14:05:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-02 14:05:13 -0700 |
| commit | 9bc44ea84f1ce1bbe2c6d2004f05524784ca2636 (patch) | |
| tree | 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dc6805745f78fae0b053f67886d002574ddcebe3 (diff) | |
| parent | 49bcf3e8b6b72b646a89d6cdec3aea1a80bb1238 (diff) | |
Merge "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp" into gingerbread-plus-aosp
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions