Merge change I56779290 into eclair

* changes:
  fix[2222341] Soft reset while going back from camcorder settings
tree: 2eeb661d91e958efb770d8a6d0749a31e2ea44c5
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE