OSDN Git Service

am 35c5dd72: (-s ours) am 38aaaa64: (-s ours) am 1b4c3db6: Merge "RIL: Support SMS...
authorEd Tam <etam@google.com>
Sat, 31 Aug 2013 01:24:37 +0000 (18:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 31 Aug 2013 01:24:37 +0000 (18:24 -0700)
commit4200f6bcfc4142bbf91b17ac2429d68a9aa3e586
tree3dc59832e465383ac1720789b9d7c64f7832bec9
parent6f388a8ac212fd559f64ad5a938874d48e4dc85a
parent35c5dd72d8a28a384e54393955e60a352a425f7e
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