am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"
am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState"

* commit 'b928b7c2bf12a5dbd31b08d244b0ff8d2a9851c1':
  AudioService: fix cross deadlock in VolumeStreamState

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base