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

Browse Source

Conflicts:
	telephony/java/com/android/internal/telephony/cdma/SmsMessage.java

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416

...

This commit is contained in:

Simon Wilson 2011-05-26 12:50:33 -07:00

parent 2150dd3750 8529096474

commit e3e4c09d92

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available