am ed4c8b6d: am 2c0feeaf: Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev
am ed4c8b6d: am 2c0feeaf: Merge "Do not turn safe volume on upon headset connection" into jb-mr1-dev

* commit 'ed4c8b6dfc1dc72c5efea8ad8f3aa166e712cbd6':
  Do not turn safe volume on upon headset connection

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