Revert "Merge remote-tracking branch 'upstream/master' into jellybean"

This reverts commit 166884c9b817042cb6f53b911cdcd3909c9d18f0, reversing
changes made to e091904eb062329e17419e4a946f10eb9dcfec6c.

	modified:   Android.mk
	modified:   CleanSpec.mk
	modified:   mockril/src/com/android/internal/telephony/mockril/MockRilController.java
	modified:   src/java/android/provider/Telephony.java
	modified:   src/java/android/telephony/SmsCbEtwsInfo.java
	modified:   src/java/android/telephony/SmsManager.java
	modified:   src/java/android/telephony/SmsMessage.java
	renamed:    src/java/com/android/internal/telephony/uicc/AdnRecord.aidl -> src/java/com/android/internal/telephony/AdnRecord.aidl
	renamed:    src/java/com/android/internal/telephony/uicc/AdnRecord.java -> src/java/com/android/internal/telephony/AdnRecord.java
	renamed:    src/java/com/android/internal/telephony/uicc/AdnRecordCache.java -> src/java/com/android/internal/telephony/AdnRecordCache.java
	renamed:    src/java/com/android/internal/telephony/uicc/AdnRecordLoader.java -> src/java/com/android/internal/telephony/AdnRecordLoader.java
	modified:   src/java/com/android/internal/telephony/ApnContext.java
	modified:   src/java/com/android/internal/telephony/BaseCommands.java
	modified:   src/java/com/android/internal/telephony/Call.java
	modified:   src/java/com/android/internal/telephony/CallManager.java
	modified:   src/java/com/android/internal/telephony/CallTracker.java
	modified:   src/java/com/android/internal/telephony/CommandException.java
	modified:   src/java/com/android/internal/telephony/CommandsInterface.java
	modified:   src/java/com/android/internal/telephony/Connection.java
	renamed:    src/java/com/android/internal/telephony/uicc/CsimFileHandler.java -> src/java/com/android/internal/telephony/CsimFileHandler.java
	modified:   src/java/com/android/internal/telephony/DataCallState.java
	modified:   src/java/com/android/internal/telephony/DataConnectionAc.java
	modified:   src/java/com/android/internal/telephony/DataConnectionTracker.java
	modified:   src/java/com/android/internal/telephony/DebugService.java
	modified:   src/java/com/android/internal/telephony/DefaultPhoneNotifier.java
	modified:   src/java/com/android/internal/telephony/DriverCall.java
	modified:   src/java/com/android/internal/telephony/IIccPhoneBook.aidl
	modified:   src/java/com/android/internal/telephony/IccCard.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccCardApplicationStatus.java -> src/java/com/android/internal/telephony/IccCardApplicationStatus.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccCardProxy.java -> src/java/com/android/internal/telephony/IccCardProxy.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccCardStatus.java -> src/java/com/android/internal/telephony/IccCardStatus.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccConstants.java -> src/java/com/android/internal/telephony/IccConstants.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccException.java -> src/java/com/android/internal/telephony/IccException.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccFileHandler.java -> src/java/com/android/internal/telephony/IccFileHandler.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccFileNotFound.java -> src/java/com/android/internal/telephony/IccFileNotFound.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccFileTypeMismatch.java -> src/java/com/android/internal/telephony/IccFileTypeMismatch.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccIoResult.java -> src/java/com/android/internal/telephony/IccIoResult.java
	modified:   src/java/com/android/internal/telephony/IccPhoneBookInterfaceManager.java
	modified:   src/java/com/android/internal/telephony/IccPhoneBookInterfaceManagerProxy.java
	modified:   src/java/com/android/internal/telephony/IccProvider.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccRecords.java -> src/java/com/android/internal/telephony/IccRecords.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccRefreshResponse.java -> src/java/com/android/internal/telephony/IccRefreshResponse.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccServiceTable.java -> src/java/com/android/internal/telephony/IccServiceTable.java
	modified:   src/java/com/android/internal/telephony/IccSmsInterfaceManager.java
	modified:   src/java/com/android/internal/telephony/IccUtils.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccVmFixedException.java -> src/java/com/android/internal/telephony/IccVmFixedException.java
	renamed:    src/java/com/android/internal/telephony/uicc/IccVmNotSupportedException.java -> src/java/com/android/internal/telephony/IccVmNotSupportedException.java
	modified:   src/java/com/android/internal/telephony/MccTable.java
	modified:   src/java/com/android/internal/telephony/Phone.java
	modified:   src/java/com/android/internal/telephony/PhoneBase.java
	modified:   src/java/com/android/internal/telephony/PhoneFactory.java
	modified:   src/java/com/android/internal/telephony/PhoneProxy.java
	modified:   src/java/com/android/internal/telephony/PhoneStateIntentReceiver.java
	modified:   src/java/com/android/internal/telephony/PhoneSubInfo.java
	modified:   src/java/com/android/internal/telephony/RIL.java
	modified:   src/java/com/android/internal/telephony/RetryManager.java
	modified:   src/java/com/android/internal/telephony/SMSDispatcher.java
	modified:   src/java/com/android/internal/telephony/ServiceStateTracker.java
	modified:   src/java/com/android/internal/telephony/SmsStorageMonitor.java
	modified:   src/java/com/android/internal/telephony/SmsUsageMonitor.java
	modified:   src/java/com/android/internal/telephony/TelephonyCapabilities.java
	renamed:    src/java/com/android/internal/telephony/uicc/UiccCard.java -> src/java/com/android/internal/telephony/UiccCard.java
	renamed:    src/java/com/android/internal/telephony/uicc/UiccCardApplication.java -> src/java/com/android/internal/telephony/UiccCardApplication.java
	renamed:    src/java/com/android/internal/telephony/uicc/UsimFileHandler.java -> src/java/com/android/internal/telephony/UsimFileHandler.java
	modified:   src/java/com/android/internal/telephony/WapPushOverSms.java
	modified:   src/java/com/android/internal/telephony/cat/AppInterface.java
	modified:   src/java/com/android/internal/telephony/cat/BerTlv.java
	modified:   src/java/com/android/internal/telephony/cat/CatCmdMessage.java
	modified:   src/java/com/android/internal/telephony/cat/CatLog.java
	modified:   src/java/com/android/internal/telephony/cat/CatResponseMessage.java
	modified:   src/java/com/android/internal/telephony/cat/CatService.java
	modified:   src/java/com/android/internal/telephony/cat/CommandParamsFactory.java
	modified:   src/java/com/android/internal/telephony/cat/ComprehensionTlv.java
	modified:   src/java/com/android/internal/telephony/cat/IconLoader.java
	modified:   src/java/com/android/internal/telephony/cat/RilMessageDecoder.java
	modified:   src/java/com/android/internal/telephony/cat/ValueParser.java
	modified:   src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
	modified:   src/java/com/android/internal/telephony/cdma/CDMAPhone.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaCallTracker.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaCallWaitingNotification.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaConnection.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaDataConnection.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaDataConnectionTracker.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaLteServiceStateTracker.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaMmiCode.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaSMSDispatcher.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaServiceStateTracker.java
	modified:   src/java/com/android/internal/telephony/cdma/CdmaSubscriptionSourceManager.java
	modified:   src/java/com/android/internal/telephony/cdma/EriManager.java
	renamed:    src/java/com/android/internal/telephony/uicc/RuimFileHandler.java -> src/java/com/android/internal/telephony/cdma/RuimFileHandler.java
	modified:   src/java/com/android/internal/telephony/cdma/RuimPhoneBookInterfaceManager.java
	renamed:    src/java/com/android/internal/telephony/uicc/RuimRecords.java -> src/java/com/android/internal/telephony/cdma/RuimRecords.java
	modified:   src/java/com/android/internal/telephony/cdma/RuimSmsInterfaceManager.java
	modified:   src/java/com/android/internal/telephony/cdma/SignalToneUtil.java
	modified:   src/java/com/android/internal/telephony/cdma/SmsMessage.java
	modified:   src/java/com/android/internal/telephony/cdma/sms/BearerData.java
	modified:   src/java/com/android/internal/telephony/gsm/GSMPhone.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmCallTracker.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmConnection.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmDataConnection.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmMmiCode.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmSMSDispatcher.java
	modified:   src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
	renamed:    src/java/com/android/internal/telephony/uicc/SIMFileHandler.java -> src/java/com/android/internal/telephony/gsm/SIMFileHandler.java
	renamed:    src/java/com/android/internal/telephony/uicc/SIMRecords.java -> src/java/com/android/internal/telephony/gsm/SIMRecords.java
	modified:   src/java/com/android/internal/telephony/gsm/SimPhoneBookInterfaceManager.java
	modified:   src/java/com/android/internal/telephony/gsm/SimSmsInterfaceManager.java
	modified:   src/java/com/android/internal/telephony/gsm/SmsMessage.java
	renamed:    src/java/com/android/internal/telephony/uicc/SpnOverride.java -> src/java/com/android/internal/telephony/gsm/SpnOverride.java
	modified:   src/java/com/android/internal/telephony/gsm/UsimDataDownloadHandler.java
	modified:   src/java/com/android/internal/telephony/gsm/UsimPhoneBookManager.java
	renamed:    src/java/com/android/internal/telephony/uicc/UsimServiceTable.java -> src/java/com/android/internal/telephony/gsm/UsimServiceTable.java
	renamed:    src/java/com/android/internal/telephony/uicc/VoiceMailConstants.java -> src/java/com/android/internal/telephony/gsm/VoiceMailConstants.java
	renamed:    src/java/com/android/internal/telephony/uicc/IsimFileHandler.java -> src/java/com/android/internal/telephony/ims/IsimFileHandler.java
	renamed:    src/java/com/android/internal/telephony/uicc/IsimRecords.java -> src/java/com/android/internal/telephony/ims/IsimRecords.java
	renamed:    src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java -> src/java/com/android/internal/telephony/ims/IsimUiccRecords.java
	modified:   src/java/com/android/internal/telephony/sip/SipConnectionBase.java
	modified:   src/java/com/android/internal/telephony/sip/SipPhone.java
	modified:   src/java/com/android/internal/telephony/sip/SipPhoneBase.java
	modified:   src/java/com/android/internal/telephony/sip/SipPhoneFactory.java
	modified:   src/java/com/android/internal/telephony/test/ModelInterpreter.java
	modified:   src/java/com/android/internal/telephony/test/SimulatedCommands.java
	modified:   src/java/com/android/internal/telephony/test/SimulatedGsmCallState.java
	deleted:    src/java/com/android/internal/telephony/uicc/IccUtils.java
	modified:   src/java/com/android/internal/telephony/uicc/UiccController.java
	modified:   tests/telephonymockriltests/src/com/android/telephonymockriltests/TelephonyMockTestRunner.java
	modified:   tests/telephonymockriltests/src/com/android/telephonymockriltests/functional/SimpleTestUsingMockRil.java
	modified:   tests/telephonytests/src/com/android/frameworks/telephonytests/TelephonyMockRilTestRunner.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/AdnRecordTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/CallerInfoTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/GsmAlphabetTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/IccServiceTableTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/MccTableTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/SMSDispatcherTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/SimPhoneBookTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/SimUtilsTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/SmsMessageBodyTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/cdma/CdmaSmsCbTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/gsm/GSMTestHandler.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/gsm/UsimServiceTableTest.java
	modified:   tests/telephonytests/src/com/android/internal/telephony/mockril/MockRilTest.java