am c55cf066: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
authorEd Tam <etam@google.com>
Fri, 30 Aug 2013 21:06:48 +0000 (14:06 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Aug 2013 21:06:48 +0000 (14:06 -0700)
commit7cc3a309e6833d854fc41f0e53f32f5a6cbbe08b
tree2541155cf90122666c86c4baad6eb9dd1c6a8bbd
parent25cebe4f95bfee61477d4048219a6644aa0aa03b
parentc55cf0666ebbd4c00fb8092f40dc26e77c56273e
am c55cf066: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit 'c55cf0666ebbd4c00fb8092f40dc26e77c56273e':
  Telephony: SMS over IMS, DO NOT MERGE
src/java/com/android/internal/telephony/RIL.java