Merge branch 'cm-10.2' of https://github.com/CyanogenMod/android_packages_apps_Phone into cm-10.2t