am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if...
am c43a685c: (-s ours) Merge "Change audio flinger to user HAL master mute if available: DO NOT MERGE" into ics-aah
* commit 'c43a685c':
Change audio flinger to user HAL master mute if available: DO NOT MERGE