am 904ee70a: am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev
am 904ee70a: am 241a2345: am 59eee7e6: Merge "getMasterStreamType from MUSIC -> NOTIFICATION" into lmp-dev

* commit '904ee70a695a76d54bd899e073eec75b1b18dbfe':
  getMasterStreamType from MUSIC -> NOTIFICATION

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