commit 04c0816541080d46f70803b58ce8666098f7089a
author Fan Zhang <zhfan@google.com> Wed Sep 27 10:23:23 2017 -0700
committer Fan Zhang <zhfan@google.com> Wed Sep 27 12:08:56 2017 -0700
tree 5aaf3351e7587f8ee5b54e953abeae51cf314ad1
parent 3f7535a8c62e98f1e21e1029235967b2deda241e

Sync to latest SettingsIntelligence source code

Test: builds & robotests
Change-Id: Ie83909a9747afd07c541c6236224f079da8a2dc9

tests/robotests/Android.mk

diff --git a/tests/robotests/Android.mk b/tests/robotests/Android.mk
index cb106ca..a27930e 100644
--- a/tests/robotests/Android.mk
+++ b/tests/robotests/Android.mk
@@ -13,7 +13,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-prebuilt \
+    platform-robolectric-3.4.2-prebuilt \
     sdk_vcurrent
 
 LOCAL_INSTRUMENTATION_FOR := SettingsIntelligence
@@ -37,4 +37,4 @@
 
 LOCAL_TEST_PACKAGE := SettingsIntelligence
 
-include prebuilts/misc/common/robolectric/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk