am 99cf71b0: am 83536cee: Merge change I1179efbb into eclair-mr2
am 99cf71b0: am 83536cee: Merge change I1179efbb into eclair-mr2

Merge commit '99cf71b0856e00c1ae9631db91702349cceb9bf8'

* commit '99cf71b0856e00c1ae9631db91702349cceb9bf8':
  Fix multi-lock ordering issues in GLSurfaceView

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base