am 88ae0ae4: am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev
am 88ae0ae4: am 40d076e6: am 61ebf9cd: Merge "audio service: make dock audio is off by default" into jb-mr1-dev

* commit '88ae0ae4848ce894612397957cf4de6a6a50a394':
  audio service: make dock audio is off by default

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