| commit | e3e4c09d9223cf70a0f83fa52eff7c4fdcde308e | [log] [tgz] |
|---|---|---|
| author | Simon Wilson <simonwilson@google.com> | Thu May 26 12:50:33 2011 -0700 |
| committer | Simon Wilson <simonwilson@google.com> | Thu May 26 12:53:15 2011 -0700 |
| tree | 2ee963463c3506b8788200904160b078e5e5a51d | |
| parent | 2150dd375044e429f56f35027874fb89da3e77d3 [diff] | |
| parent | 85290964740394ed8fc461ac023afd2f75bbe51d [diff] |
resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp Conflicts: telephony/java/com/android/internal/telephony/cdma/SmsMessage.java Change-Id: I4c808c752954c5d1f752f4b4c02ad41ea491e416