Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev
Ed Tam [Fri, 30 Aug 2013 20:50:41 +0000 (20:50 +0000)]

Trivial merge