Reconcile with jb-mr1-release - do not merge
am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '61c0f4fa6f2e3049018f70706227cc256a529801':
am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '76b149158bebe5ae8259d1db497fc38b5c5ef37b':
am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '6fdb2a116c95a51953cf2203b8af0ac84cbeb2b2':
am 1d5c4afa: am 6fdb2a11: am 76b14915: (-s ours) am 61c0f4fa: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d5c4afa91fb2b15402a0e57f98d4b00e0a9cfc5':
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/frameworks/opt/mms into cm-10.2

Android 4.3 Release 3.1
Korean Mms fix (2/2)

Change-Id: I7288230b01406604d1a80d2c8d76f85ef0ea0f4c