Merge "SettingsRoboTests: Remove direct dep on sdk_vcurrent module."
diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index ae0102f..9afd78e 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -14,7 +14,6 @@
LOCAL_JAVA_LIBRARIES := \
junit \
platform-robolectric-prebuilt \
- sdk_vcurrent \
telephony-common
LOCAL_INSTRUMENTATION_FOR := Settings
@@ -40,4 +39,4 @@
LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-include prebuilts/misc/common/robolectric/run_robotests.mk
\ No newline at end of file
+include prebuilts/misc/common/robolectric/run_robotests.mk
diff --git a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
index f2d1e65..ec35d5c 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java
@@ -20,7 +20,6 @@
import android.content.Context;
import android.os.UserManager;
-import android.test.mock.MockContentResolver;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.applications.PackageManagerWrapper;
@@ -59,7 +58,6 @@
private PackageManagerWrapper mPackageManager;
private ShortcutServicePickerFragment mFragment;
- private MockContentResolver mContentResolver;
@Before
public void setUp() {
