OSDN Git Service

resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp
authorSimon Wilson <simonwilson@google.com>
Thu, 26 May 2011 19:50:33 +0000 (12:50 -0700)
committerSimon Wilson <simonwilson@google.com>
Thu, 26 May 2011 19:53:15 +0000 (12:53 -0700)
commite3e4c09d9223cf70a0f83fa52eff7c4fdcde308e
tree2ee963463c3506b8788200904160b078e5e5a51d
parent2150dd375044e429f56f35027874fb89da3e77d3
parent85290964740394ed8fc461ac023afd2f75bbe51d
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp

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

Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416