diff options
| author | Scott Main <smain@google.com> | 2010-08-05 15:53:04 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-05 15:53:04 -0700 |
| commit | 1f1dfc8936378bf8ac12b4f486a42d2b32274100 (patch) | |
| tree | af4a96bbc5821c673a67c7b52ee486dc893af93a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 9aee65669137d0f772ac2c06b9242e2ef36f5a74 (diff) | |
| parent | 6180fa278e073507a17e133986bfa9511fe9323e (diff) | |
am 005e2400: Merge "fix xml sample error" into froyo
Merge commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c' into gingerbread
* commit '005e2400b573b4b5e8ba3d2b3221ec958f9b0f2c':
fix xml sample error
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions