Merge change 20857
authorAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Aug 2009 21:02:46 +0000 (14:02 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 13 Aug 2009 21:02:46 +0000 (14:02 -0700)
commit17674e5adcb2fbac4e7a8d9ef92ff5bd6f842b9d
treea261726f9e767696a798a01fb1290152b88c185f
parentc4d5bd1c65a3f87f1eda810bb5c3f6fe067a4a06
parent4485565b0141038f65f8f1de5cccc2bafc55dcfa
Merge change 20857

* changes:
  Adjust for ConnMann change around MOBILE_MMS type