diff options
| author | Scott Main <smain@google.com> | 2010-09-03 13:28:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 13:28:18 -0700 |
| commit | c7a57c820da3bad17ef8c6bc18e24fdf949af809 (patch) | |
| tree | 365957e2f10f97798d21ec768eca47c686f90315 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 68fd04dba4d108cb51235f20184e22e13126bc87 (diff) | |
| parent | add8dbe4248bdefd0ef18d5cfb9046b2dd0706f8 (diff) | |
am bfbf84b7: am 2b136832: am c4367e54: fix code snippet error
Merge commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb'
* commit 'bfbf84b7265310d154f8dc9e0b1e85b2a56bdfcb':
fix code snippet error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions