diff options
| author | Scott Main <smain@google.com> | 2010-09-03 13:18:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-03 13:18:28 -0700 |
| commit | add8dbe4248bdefd0ef18d5cfb9046b2dd0706f8 (patch) | |
| tree | 6ca016689d76855a34a6cd944e00a19b1cb92bcd /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 79c2bf154226a2382fc693ae5bd8709dcd0a2312 (diff) | |
| parent | 80d32d71b4fb5e44713efc259397322a6979db7e (diff) | |
am 2b136832: am c4367e54: fix code snippet error
Merge commit '2b136832be7326caed0c79bae418c2dd54372bea' into gingerbread-plus-aosp
* commit '2b136832be7326caed0c79bae418c2dd54372bea':
fix code snippet error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions