diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-05-17 14:52:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-05-17 14:52:21 -0700 |
| commit | e8cde6f9ba713a7f579fee226c9a41753d48b332 (patch) | |
| tree | a8ff93c42fb45597ef036e11858677c9666692e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8beed593d5ac81eecb37ab90aa57114d68ab79ea (diff) | |
| parent | de0076c7782b8feccf4d234e5b96700d6587218b (diff) | |
am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions