am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
am 3e3d641c: Merge "Added mpga as valid MediaFile extension"

* commit '3e3d641c612fc6bacd367be696ae6125009d18d3':
  Added mpga as valid MediaFile extension

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