OSDN Git Service

am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev
authorEd Tam <etam@google.com>
Fri, 30 Aug 2013 21:06:49 +0000 (14:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Aug 2013 21:06:49 +0000 (14:06 -0700)
commit38aaaa6494bd6deb42de8397fb421d1fb3b4e352
treeda41d5d9e86935866bdc89450b235a9adcdcbe99
parentf088ef91d98bf642d0944351daaec61df1e7c8e0
parent1b4c3db6f9d9da4d3115be1c4337b98aebdd6193
am 1b4c3db6: Merge "RIL: Support SMS on IMS, DO NOT MERGE" into jb-mr2-dev

* commit '1b4c3db6f9d9da4d3115be1c4337b98aebdd6193':
  RIL: Support SMS on IMS, DO NOT MERGE
include/telephony/ril.h
libril/ril.cpp