| commit | 2b83a3293267b3bdb09fcdc47a800ab4a151bb07 | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Dec 10 17:38:01 2012 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Dec 10 17:38:02 2012 -0800 |
| tree | be7a17e83f4274c627f9101fa74e0eaa6ceec5c9 | |
| parent | e7d92d4723582e73e164708c02a1fb040f296b0d [diff] | |
| parent | 4d049b7b7035270aa79f619bbada943ed0feb665 [diff] |
Merge "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;