am 0a91a547: am 0ee41ccc: Merge change I1558a070 into eclair-mr2

Merge commit '0a91a547ee32d559b7b737f69430d4d0732dfca9'

* commit '0a91a547ee32d559b7b737f69430d4d0732dfca9':
  Fix the camera preview demo.