0a0293b699
Merge commit 'ba56915a71cad672baff5594dbb7c9331bf01283' into eclair-plus-aosp * commit 'ba56915a71cad672baff5594dbb7c9331bf01283': Fix multi-lock ordering issues in GLSurfaceView