am 59845bef: Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev
am 59845bef: Merge "Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags" into mnc-dev

* commit '59845bef8e66c278c728744785852b8799d832fc':
  Extra for ACTION_RINGTONE_PICKER for AudioAttributes flags

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