Merge branch "cm-11.0" into kylin
Merge branch 'kitkat' of https://github.com/KylinMod/android_frameworks_opt_telephony into kitkat