Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Mms into DJL10.2
Merge branch 'DJL10.2' of github.com:DJL10-2/android_packages_apps_Mms into DJL10.2