diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-12 18:13:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 18:13:42 -0700 |
| commit | 8346872699c8fc9dc44698fc52d73148e30a5427 (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 4ebcedf964858c022b2f03fb7d47e9c7b43163dd (diff) | |
| parent | fa89eab3e466d4cadf39bb89556558d85b4988d6 (diff) | |
am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
Merge commit 'ff38e38d05a39584650c7c37b4b528334529ec0f' into gingerbread-plus-aosp
* commit 'ff38e38d05a39584650c7c37b4b528334529ec0f':
Undo API patch due to field pulled up to superclass.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions