am cd2433f3: fix[2222341] Soft reset while going back from camcorder settings

Merge commit 'cd2433f3804a537aedc26f595b1c05f95a05244a' into eclair-mr2

* commit 'cd2433f3804a537aedc26f595b1c05f95a05244a':
  fix[2222341] Soft reset while going back from camcorder settings
tree: 49f8cce626c5c8772ad25d67f3e13f2f69234197
  1. include/
  2. modules/
  3. Android.mk
  4. hardware.c
  5. MODULE_LICENSE_APACHE2
  6. NOTICE