commit | 1496aaafb2d4ead994e4335512a26252c38f739c | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Dec 10 17:39:05 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 17:39:05 2012 -0800 |
tree | be7a17e83f4274c627f9101fa74e0eaa6ceec5c9 | |
parent | 0cce4184dad2d8c507e1d509d37fd9de9e0e618e [diff] | |
parent | 883bf96b0a564cac0fce845fe249147c4bd1cad5 [diff] |
am 883bf96b: Import translations. DO NOT MERGE * commit '883bf96b0a564cac0fce845fe249147c4bd1cad5': 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;