Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	Android.mk
	src/java/com/android/internal/telephony/BaseCommands.java
	src/java/com/android/internal/telephony/CallManager.java
	src/java/com/android/internal/telephony/CommandsInterface.java
	src/java/com/android/internal/telephony/ISms.aidl
	src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
	src/java/com/android/internal/telephony/IccSmsInterfaceManagerProxy.java
	src/java/com/android/internal/telephony/PhoneFactory.java
	src/java/com/android/internal/telephony/RIL.java
	src/java/com/android/internal/telephony/SMSDispatcher.java
	src/java/com/android/internal/telephony/ServiceStateTracker.java
	src/java/com/android/internal/telephony/cat/CatService.java
	src/java/com/android/internal/telephony/cat/ValueParser.java
	src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
	src/java/com/android/internal/telephony/cdma/CdmaConnection.java
	src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
	src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
	src/java/com/android/internal/telephony/dataconnection/DcTracker.java
	src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java
	src/java/com/android/internal/telephony/gsm/GSMPhone.java
	src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
	src/java/com/android/internal/telephony/sip/SipCommandInterface.java
	src/java/com/android/internal/telephony/test/SimulatedCommands.java

Change-Id: Ia5d71c6d0526c4b3595e623f763a75fd27ee8744
Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_opt_telephony into cm-10.2

Conflicts:
	src/java/com/android/internal/telephony/uicc/IccFileHandler.java

Change-Id: I716714f2bf251f0bc2ee6aa3b1edcfe8dc35d79a
Merge branch 'cm-10.2' of git://github.com/Mustaavalkosta/android_frameworks_opt_telephony into cm-10.2