diff options
| author | Adam Powell <adamp@google.com> | 2010-10-04 19:59:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 19:59:35 -0700 |
| commit | 3568e83037d7f7680b05434ec362b8672d2cffd4 (patch) | |
| tree | ad0f6e6006ddeb3b24e08d56646d0aa340825607 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ff87f54349351571b8e81835fbaa2e02d17f0e9f (diff) | |
| parent | e9a5488e1a2c49e67da47fc54a0a98a7ef9879c5 (diff) | |
am 1c2911a6: Merge "Fix bug 3061769" into gingerbread
Merge commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd' into gingerbread-plus-aosp
* commit '1c2911a648bdf5b2d8978ce96756ae82b7d452bd':
Fix bug 3061769
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions