am dd861689: Merge change I05fd0df0 into eclair

Merge commit 'dd861689924198ed22115f0e21be1b81e159a7cc' into eclair-mr2

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