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)
* commit '1b4c3db6f9d9da4d3115be1c4337b98aebdd6193':
  RIL: Support SMS on IMS, DO NOT MERGE

1  2 
include/telephony/ril.h
libril/ril.cpp

Simple merge
diff --cc libril/ril.cpp
Simple merge