am d85545d0: am d01767f8: Merge change I56779290 into eclair

Merge commit 'd85545d0b4c92cceafafce98f246483de5c4903e' into eclair-mr2-plus-aosp

* commit 'd85545d0b4c92cceafafce98f246483de5c4903e':
  fix[2222341] Soft reset while going back from camcorder settings