summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2012-12-10 14:48:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-10 14:48:21 -0800
commit879723dd2d89238bdd6c9e126e4c7a4418469c84 (patch)
treec7d648319170f36767e0ca6b7e09fc79a09ed0e9 /packages
parenta52b4792d134c257d0e897dbd39e6c1a53e30bb5 (diff)
parente22217c2787b0f4967b357d080d49a7f095b2db9 (diff)
downloadframeworks_base-879723dd2d89238bdd6c9e126e4c7a4418469c84.zip
frameworks_base-879723dd2d89238bdd6c9e126e4c7a4418469c84.tar.gz
frameworks_base-879723dd2d89238bdd6c9e126e4c7a4418469c84.tar.bz2
am e22217c2: Merge "Telephony: Use IccUtils from uicc package"
* commit 'e22217c2787b0f4967b357d080d49a7f095b2db9': Telephony: Use IccUtils from uicc package
Diffstat (limited to 'packages')
-rw-r--r--packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java b/packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java
index f436cb4..305ee37 100644
--- a/packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java
+++ b/packages/WAPPushManager/tests/src/com/android/smspush/unitTests/WapPushTest.java
@@ -27,10 +27,10 @@ import android.provider.Telephony.Sms.Intents;
import android.test.ServiceTestCase;
import android.util.Log;
-import com.android.internal.telephony.IccUtils;
import com.android.internal.telephony.IWapPushManager;
import com.android.internal.telephony.WapPushManagerParams;
import com.android.internal.telephony.WspTypeDecoder;
+import com.android.internal.telephony.uicc.IccUtils;
import com.android.internal.util.HexDump;
import com.android.smspush.WapPushManager;