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

* commit 'd31fed90f8fdf854cade08af94918066af921d74':
  Have SmsMessage use getCurrentPhoneType