tree be55b2cc1e100589fa765c1d7042cab519126acd
parent 6608bd0d3af3f9c365b73f8b19d9ec0b7d5ee70b
parent 76169da0e84b0fcf621aeac6141af3ee85bc7c1e
author Mathias Agopian <mathias@google.com> 1260495641 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260495641 -0800

am 76169da0: fix [2315900] Monochrome camera preview screen after launching camera

Merge commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e' into eclair-mr2

* commit '76169da0e84b0fcf621aeac6141af3ee85bc7c1e':
  fix [2315900] Monochrome camera preview screen after launching camera