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

* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
  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