am 8091424e: am 9b52a218: Fix #2269582 Sometimes camera preview screen is truncated

Merge commit '8091424ea332f754e6f1c712a9e28bfa7d02741e' into eclair-mr2-plus-aosp

* commit '8091424ea332f754e6f1c712a9e28bfa7d02741e':
  Fix #2269582 Sometimes camera preview screen is truncated