Commits
Ed Tam authored and Android Git Automerger committed 00e4c6721b3M
am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev * commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be': Telephony: SMS over IMS, DO NOT MERGE
Showing diff to40765a4a530