am 94dbc990: am d31fed90: Merge "Have SmsMessage use getCurrentPhoneType" into honeycomb

* commit '94dbc990b8840d323d358770a1ba02bb4820c681':
  Have SmsMessage use getCurrentPhoneType