am 2aa10791: am 96dac84b: am 121a31ac: Merge change Id86beb99 into eclair

Merge commit '2aa107917b5a7e6de720a34c4701de55ee9772eb'

* commit '2aa107917b5a7e6de720a34c4701de55ee9772eb':
  fix [2291418] Camera preview cannot work in Emulator