am 47dd2cf1: Fix black screen after resuming camera.

Merge commit '47dd2cf1dacad3687410ea6e8e4f05542a5fdc46' into eclair-plus-aosp

* commit '47dd2cf1dacad3687410ea6e8e4f05542a5fdc46':
  Fix black screen after resuming camera.