Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Mms into cm-10.2
Merge branch 'cm-10.2' of github.com:Hellybean/android_packages_apps_Mms into cm-10.2