am 952f6bf8: (-s ours) am 3f0b1eaa: Merge "Change audio flinger to user HAL...
am 952f6bf8: (-s ours) am 3f0b1eaa: Merge "Change audio flinger to user HAL master mute if available" into jb-mr1-dev
* commit '952f6bf8':
Change audio flinger to user HAL master mute if available