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

Conflicts:
	src/java/com/android/internal/telephony/HTCCDMAQualcommRIL.java
Merge branch 'cm-10.2' of https://github.com/TaoSP/android_frameworks_opt_telephony into cm-10.2

Conflicts:
	src/java/com/android/internal/telephony/HTCCDMAQualcommRIL.java