99cf71b085
Merge commit '83536cee2b2b5445c5ba0b22531c23890b82da41' into eclair-mr2-plus-aosp * commit '83536cee2b2b5445c5ba0b22531c23890b82da41': Fix multi-lock ordering issues in GLSurfaceView