Commits
Simon Wilson authored 62388cfc1fbM
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp Conflicts: telephony/java/com/android/internal/telephony/cdma/SmsMessage.java Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416
Showing diff to7f9d3210cbe