Merge branch 'cm-10.2' of github.com:CyanogenMod/android_frameworks_opt_telephony into jb43-legacy
Merge branch 'jb43-legacy' of https://github.com/ParanoidAndroid/android_frameworks_opt_telephony into jb4.3