Merge change Ie806ae6f into eclair

* changes:
  Fix multi-lock ordering issues in GLSurfaceView
tree: aa600df0f0ec4747adbd7a832abfbf0c54689553
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE