tree a0db71d829e4461ff72652eb0dae4c8fb6679290
parent 40765a4a5300914e8c7ce7ed6397cec7ab8d78a1
parent f85aa0fc12edccf529dbaf0340372bf3a19bc4be
author Ed Tam <etam@google.com> 1377896685 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377896685 -0700

am f85aa0fc: Merge "Telephony: SMS over IMS, DO NOT MERGE" into jb-mr2-dev

* commit 'f85aa0fc12edccf529dbaf0340372bf3a19bc4be':
  Telephony: SMS over IMS, DO NOT MERGE