am 5d36715a: am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
am 5d36715a: am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"

* commit '5d36715a76e275fe25f0fe65530c6aae3852d914':
  VolumePreference.onActivityStop only stops playback

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