Snap for 4531101 from a1e3feb9723f4eec03458059a03783b944b14a5f to pi-release

Change-Id: I519621d2f1f5a0b20822d40a0a1e58a4332e4c1d
diff --git a/tests/robolectric/Android.mk b/tests/robolectric/Android.mk
index 86ac475..b8dd926 100644
--- a/tests/robolectric/Android.mk
+++ b/tests/robolectric/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_JAVA_LIBRARIES := \
     junit \
-    platform-robolectric-3.5.1-prebuilt
+    platform-robolectric-3.6.1-prebuilt
 
 LOCAL_INSTRUMENTATION_FOR := EmergencyInfo
 LOCAL_MODULE := EmergencyInfoRoboTests
@@ -48,4 +48,4 @@
 
 LOCAL_TEST_PACKAGE := EmergencyInfo
 
-include prebuilts/misc/common/robolectric/3.5.1/run_robotests.mk
\ No newline at end of file
+include prebuilts/misc/common/robolectric/3.6.1/run_robotests.mk
\ No newline at end of file