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

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