Merge "Fix some frameworks-telephony test compile errors." into jb-mr2-dev
diff --git a/tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java b/tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
index 91c481d..4a4a07a 100755
--- a/tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/ApnSettingTest.java
@@ -16,11 +16,12 @@
 
 package com.android.internal.telephony;
 
-import junit.framework.TestCase;
-import android.telephony.Rlog;
-
 import android.test.suitebuilder.annotation.SmallTest;
 
+import com.android.internal.telephony.dataconnection.ApnSetting;
+
+import junit.framework.TestCase;
+
 public class ApnSettingTest extends TestCase {
 
     public static final String[] TYPES = {"default", "*"};
diff --git a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
index 980be13..cd0fad3 100644
--- a/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
+++ b/tests/telephonytests/src/com/android/internal/telephony/gsm/UsimDataDownloadCommands.java
@@ -615,6 +615,14 @@
     }
 
     @Override
+    public void getCellInfoList(Message result) {
+    }
+
+    @Override
+    public void setCellInfoListRate(int rateInMillis, Message response) {
+    }
+
+    @Override
     public void getIMSIForApp(String aid, Message result) {
     }