am 41b82609: am dd861689: Merge change I05fd0df0 into eclair

Merge commit '41b8260914746d05e1333cfcf228cc8c0a2380b9' into eclair-mr2-plus-aosp

* commit '41b8260914746d05e1333cfcf228cc8c0a2380b9':
  Fix potential deadlock in stopPreview/stopRecord.
tree: a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE