commit 41bf13d9bda52ddee6ba2959a7f92babeb127257
author James Lemieux <jplemieux@google.com> Fri Jan 05 15:10:51 2018 -0800
committer James Lemieux <jplemieux@google.com> Fri Jan 05 15:10:51 2018 -0800
tree 11bd87bf85aaed1b3e30ade384c892bc5c9c05ab
parent 241450c84276dd421eebecd2f2059b1648aa4a84

Adopt robolectric 3.6.1

Bug: 71596155
Test: make RunKeyChainRoboTests
Change-Id: Ifcdfb9a4116ea056066721461f66eed56478d602

robotests/Android.mk

diff --git a/robotests/Android.mk b/robotests/Android.mk
index a6b854f..6165044 100644
--- a/robotests/Android.mk
+++ b/robotests/Android.mk
@@ -14,7 +14,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.5.1-prebuilt \
+    platform-robolectric-3.6.1-prebuilt \
     telephony-common
 
 LOCAL_INSTRUMENTATION_FOR := KeyChain
@@ -42,4 +42,4 @@
 
 LOCAL_ROBOTEST_TIMEOUT := 36000
 
-include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk
+include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk