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