diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-09-12 18:16:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-12 18:16:22 -0700 |
| commit | 1ad67dec163c6108b9a58f3ba41330bcc5f45566 (patch) | |
| tree | 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 30b17cdedd86fd0be5984ad798e8e2758cd0f484 (diff) | |
| parent | 8346872699c8fc9dc44698fc52d73148e30a5427 (diff) | |
am 89b4cb1e: am ff38e38d: Merge "Undo API patch due to field pulled up to superclass." into gingerbread
Merge commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea'
* commit '89b4cb1e98dee8ed0b4adddf20fe8fa078efcbea':
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