am 496f6e2a: am b54980d1: Merge "Fix issue #5588689: Black camera preview after coming back from gmail" into ics-mr1

* commit '496f6e2ad656c5bb8a277e191554d16abd290b58':
  Fix issue #5588689: Black camera preview after coming back from gmail
This commit is contained in:
Dianne Hackborn 2011-11-28 16:57:17 -08:00 committed by Android Git Automerger
commit 37e197943e

Diff Content Not Available