diff options
author | Romain Guy <romainguy@android.com> | 2009-11-12 13:42:00 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-12 13:42:00 -0800 |
commit | 315bace7db462a8b210b622691797682c4054c75 (patch) | |
tree | 685b58a8bc7e1b183cfc2a85aa4d9822550f1977 /opengl/tests/gl_basic/gl_basic.cpp | |
parent | f87f26073f44bee8aecff275e6921764478f51c9 (diff) | |
parent | ad55651fe7a0525bbf38efe47000a56685b6e81a (diff) |
am b602c328: Merge change I31c52bef into eclair
Merge commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900' into eclair-mr2
* commit 'b602c328c24f82d61038ac1222bd40a3cc7bc900':
Revert change incorrectly submitted as part of change #32153.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions