| commit | c452a40eea5a8bc23b05201e70a9ca740ee9ceec | [log] [tgz] |
|---|---|---|
| author | Jake Hamby <jhamby@google.com> | Wed Aug 29 18:19:04 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 29 18:19:04 2012 -0700 |
| tree | 6881c386ff69eca08eae5e90b5199aa4f36a48a5 | |
| parent | 12631ec35eafc466e0deef315daa5fdfb5066372 [diff] | |
| parent | 044a9b97b01a934e6cd9ef2f2914d401c4fa145b [diff] |
am 044a9b97: resolved conflicts for merge of b35e4d77 to jb-dev-plus-aosp * commit '044a9b97b01a934e6cd9ef2f2914d401c4fa145b': Fix CDMA decoding of multipart UTF-16 SMS messages.