am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1

* commit '4bc873e6ff73200af866f8c9efca66ad8ed23682':
  Switch camera sounds to always use the system enforced audio stream.
This commit is contained in:
Eino-Ville Talvala 2012-01-06 15:51:44 -08:00 committed by Android Git Automerger
commit 7f52e90aea

Diff Content Not Available