am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp

Browse Source

* commit '044a9b97b01a934e6cd9ef2f2914d401c4fa145b':
  Fix CDMA decoding of multipart UTF-16 SMS messages.

...

This commit is contained in:

Jake Hamby

2012-08-29 18:19:04 -07:00

committed by Android Git Automerger

parent 12631ec35e 044a9b97b0

commit c452a40eea

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

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

Diff Content Not Available