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