am bf2e088b: Merge into jb-mr1-dev
am bf2e088b: Merge into jb-mr1-dev

* commit 'bf2e088b008cdc80059b943c3b144ec982963f4e':
  Volume keys control music volume after music stops

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