am d01767f8: Merge change I56779290 into eclair

Merge commit 'd01767f8b7038108f9125cd2122b117db9919824' into eclair-mr2

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