Merge "Use binary resource support in robolectric"

diff --cc tests/robotests/src/com/android/settings/development/MobileDataAlwaysOnPreferenceControllerTest.java
Simple merge

diff --cc tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
index 81f87b9,ced9a9e..2af84f9
--- 1/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
--- 2/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
+++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardManagerTest.java
@@@ -43,9 -36,8 +43,9 @@@ import org.robolectric.RuntimeEnvironme
  
  import java.util.ArrayList;
  import java.util.List;
 +import java.util.Map;
  
- @RunWith(SettingsRobolectricTestRunner.class)
+ @RunWith(RobolectricTestRunner.class)
  public class ContextualCardManagerTest {
  
      private static final String TEST_SLICE_URI = "context://test/test";

diff --cc tests/robotests/src/com/android/settings/wifi/WifiSliceTest.java
Simple merge