diff options
| author | Scott Main <smain@google.com> | 2010-08-05 15:56:13 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 15:56:13 -0700 |
| commit | 56dbd906bc1b94077433c5e172cfc4eb8aa223c8 (patch) | |
| tree | fa9980169c3a61a355714df5f4a5f96a26944d62 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 07bf64be1cbb572f9f119743f5c799062481ef51 (diff) | |
| parent | 1f1dfc8936378bf8ac12b4f486a42d2b32274100 (diff) | |
am 432a2a1b: am 005e2400: Merge "fix xml sample error" into froyo
Merge commit '432a2a1bc7fb66e604772052f770857c149b2f97' into gingerbread-plus-aosp
* commit '432a2a1bc7fb66e604772052f770857c149b2f97':
fix xml sample error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions