Merge "[Settings] Fix test case" am: 9d66571966 am: 1aac3bb569

am: 5b6dcf42af

Change-Id: Ia68856654d377c38444299282a7d4e1bb5c4c6e5

diff --cc tests/robotests/Android.bp
index 653f074,d7d1d51..a825c32
--- 1/tests/robotests/Android.bp
--- 2/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@@ -62,10 -59,10 +62,10 @@@ android_robolectric_test 
  
      static_libs: [
          "SettingsLib-robo-testutils",
-       "app-compat-annotations",
+       "android-support-annotations",
      ],
  
 -    java_resource_dirs: ["config"],
 +    java_resource_dirs: ["config", "resources"],
  
      instrumentation_for: "SettingsRoboTestStub",