tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent 61cb633f43fd312e5063d1feb493d7f8cbe36688
parent 651fdee192992932298936a08c8b920e3551a18d
author Jean-Baptiste Queru <jbq@google.com> 1329513511 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329513511 -0800

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