| commit | 4200f6bcfc4142bbf91b17ac2429d68a9aa3e586 | [log] [tgz] |
|---|---|---|
| author | Ed Tam <etam@google.com> | Fri Aug 30 18:24:37 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 30 18:24:37 2013 -0700 |
| tree | 3dc59832e465383ac1720789b9d7c64f7832bec9 | |
| parent | 6f388a8ac212fd559f64ad5a938874d48e4dc85a [diff] | |
| parent | 35c5dd72d8a28a384e54393955e60a352a425f7e [diff] |
am 35c5dd72: (-s ours) am 38aaaa64: (-s ours) am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev * commit '35c5dd72d8a28a384e54393955e60a352a425f7e': RIL: Support SMS on IMS, DO NOT MERGE