am c2461eb3: Merge "Add support for bmp and wav content types in MMS"
am c2461eb3: Merge "Add support for bmp and wav content types in MMS"

* commit 'c2461eb32ebad522a946e9fef9c31e886d98124a':
  Add support for bmp and wav content types in MMS

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