Merge commit '6bc40988' into fix-merge-conflict
authorWink Saville <wink@google.com>
Mon, 15 Sep 2014 21:40:14 +0000 (14:40 -0700)
committerWink Saville <wink@google.com>
Mon, 15 Sep 2014 21:40:14 +0000 (14:40 -0700)
commit33344796c787ee6000c35f59f21c3de282d7eef5
treeb64620600edff8eda198282c6c13565b0e197231
parentaf8b9442da9d57a290cdcdf07af7164531961ab1
parent6bc4098827f3070a44b5e51508b455d7c7be9c07
Merge commit '6bc40988' into fix-merge-conflict

* commit '6bc40988':
  ksd to lmp-sprout-dev

Conflicts:
src/java/android/telephony/MessagingConfigurationManager.java
src/java/android/telephony/SmsManager.java
src/java/com/android/internal/telephony/IccProvider.java
src/java/com/android/internal/telephony/PhoneSubInfoProxy.java
src/java/com/android/internal/telephony/SubInfoRecordUpdater.java
src/java/com/android/internal/telephony/SubscriptionController.java
src/java/com/android/internal/telephony/cdma/CDMALTEPhone.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/dataconnection/DctController.java

Change-Id: I4e1c9d8c7d4f541152f13e21825aa96dd56b126f
15 files changed:
src/java/com/android/internal/telephony/BaseCommands.java
src/java/com/android/internal/telephony/CallManager.java
src/java/com/android/internal/telephony/Phone.java
src/java/com/android/internal/telephony/PhoneBase.java
src/java/com/android/internal/telephony/PhoneProxy.java
src/java/com/android/internal/telephony/PhoneSubInfoController.java
src/java/com/android/internal/telephony/RIL.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/gsm/GSMPhone.java
src/java/com/android/internal/telephony/uicc/IccCardProxy.java
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
src/java/com/android/internal/telephony/uicc/UiccCard.java