commit 482e8570d1a60145e47ef7ba461893bdd27db975
author Tobias Thierer <tobiast@google.com> Mon Oct 15 21:59:32 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Oct 15 21:59:32 2018 -0700
tree e859d051967989e002a0d231cbec38daa29f76c0
parent 475dcbb5b4857227b101d8e4ae4364e92b245a32
parent a81b5b481c12bf81c92827f4bfa2dd0723cee7d5

Merge "Update robolectric dependency to v3.6.2." am: cc54c93376 am: 9ff0f548a9
am: a81b5b481c

Change-Id: I5b3a002415a11a71d72e3a35a86d40a6ccf0a045

services/robotests/Android.mk

diff --git a/services/robotests/Android.mk b/services/robotests/Android.mk
index 78c0be4..e67f8d3 100644
--- a/services/robotests/Android.mk
+++ b/services/robotests/Android.mk
@@ -84,7 +84,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.6.1-prebuilt
+    platform-robolectric-3.6.2-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := FrameworksServicesLib
 LOCAL_MODULE := FrameworksServicesRoboTests
@@ -109,4 +109,4 @@
 
 LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))backup/java
 
-include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.2/run_robotests.mk