commit | 5419d9b23ef6a72caf885ea62576b17a493d00bc | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Wed Dec 12 10:34:51 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 12 10:34:51 2012 -0800 |
tree | 8027fdb2a25c9579b5800d07d406325c40c5de62 | |
parent | 626bef9d4028a8d2d6c0f3975e8a5d34d0681049 [diff] | |
parent | ee0979e89ac22e43c95c14da2f86627a583a9ec5 [diff] |
am ee0979e8: am ac36d013: Import translations. DO NOT MERGE * commit 'ee0979e89ac22e43c95c14da2f86627a583a9ec5': Import translations. DO NOT MERGE
diff --git a/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java b/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java index 095ce06..b2150f1 100644 --- a/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java +++ b/tests/src/com/android/cellbroadcastreceiver/DialogSmsDisplayTests.java
@@ -27,8 +27,8 @@ import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.gsm.GsmSmsCbMessage; +import com.android.internal.telephony.uicc.IccUtils; /** * Various instrumentation tests for CellBroadcastReceiver.
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java index 71ca812..f7bee6e 100644 --- a/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java +++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendCdmaCmasMessages.java
@@ -27,7 +27,6 @@ import android.util.Log; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.cdma.sms.BearerData; import com.android.internal.telephony.cdma.sms.CdmaSmsAddress; import com.android.internal.telephony.cdma.sms.SmsEnvelope;
diff --git a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java index 1867118..e85299d 100644 --- a/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java +++ b/tests/src/com/android/cellbroadcastreceiver/tests/SendTestMessages.java
@@ -25,8 +25,8 @@ import com.android.internal.telephony.EncodeException; import com.android.internal.telephony.GsmAlphabet; -import com.android.internal.telephony.IccUtils; import com.android.internal.telephony.gsm.GsmSmsCbMessage; +import com.android.internal.telephony.uicc.IccUtils; import java.io.UnsupportedEncodingException;