Irfan Sheriff aec39e625b Merge "resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-02-02 16:03:29 -08:00

..

android/telephony

Have SmsMessage use getCurrentPhoneType

2011-02-02 14:19:55 -08:00

com/android/internal/telephony

resolved conflicts for merge of ec348b49 to honeycomb-plus-aosp

2011-02-02 16:02:37 -08:00