am e5262c7f: am 6febe17c: Merge "AudioFlinger: Better handling for master...
am e5262c7f: am 6febe17c: Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-dev
* commit 'e5262c7f':
AudioFlinger: Better handling for master volume/mute