am 96553f04: Merge change 24732 into eclair
am 96553f04: Merge change 24732 into eclair

Merge commit '96553f0477368136d99d265c277594289b035cc6'

* commit '96553f0477368136d99d265c277594289b035cc6':
  Bug 2113258. Change SMS and MMS to text and multimedia.

bmaupin/android-sms-plus