Merge commit '7e4b734a' into fix-merge-conflict
authorWink Saville <wink@google.com>
Mon, 10 Dec 2012 23:14:59 +0000 (15:14 -0800)
committerWink Saville <wink@google.com>
Mon, 10 Dec 2012 23:14:59 +0000 (15:14 -0800)
commit60dc9dc311361f9fb52155ea28d383d55afa90d8
tree3f054589a9fbc049509dd0fe0501bc195072b0b5
parent9db40ea226ac2fb46417df55784f9dd3599450a1
parent7e4b734af72aa456b4a4a4bb217c1ca2c0f15ca7
Merge commit '7e4b734a' into fix-merge-conflict

* commit '7e4b734a':
  Telephony: Move uicc classes into uicc package

Change-Id: Iacc7f1805500bfe55299aaedbe0241ebba8e8b23
15 files changed:
src/java/com/android/internal/telephony/CommandsInterface.java
src/java/com/android/internal/telephony/DataConnectionTracker.java
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/ServiceStateTracker.java
src/java/com/android/internal/telephony/cdma/CDMAPhone.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/gsm/GSMPhone.java
src/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
src/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
src/java/com/android/internal/telephony/uicc/IccRecords.java
src/java/com/android/internal/telephony/uicc/IsimUiccRecords.java
src/java/com/android/internal/telephony/uicc/RuimRecords.java
src/java/com/android/internal/telephony/uicc/SIMRecords.java
tests/telephonytests/src/com/android/internal/telephony/gsm/GsmSmsCbTest.java