diff options
| author | Scott Main <smain@google.com> | 2010-08-05 15:59:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 15:59:10 -0700 |
| commit | 88827eabb397b008c06d1b281e7a03770667c131 (patch) | |
| tree | 6d8db2ea573a837bf75850982e102a4d232851df /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | cb49d1cbae70420d632495bccacf88dfc6a5277a (diff) | |
| parent | 56dbd906bc1b94077433c5e172cfc4eb8aa223c8 (diff) | |
am dd08aca6: am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo
Merge commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581'
* commit 'dd08aca684a3ddbeacd58591743e654fc4bc7581':
fix xml sample error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions