summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Liu <congxiliu@google.com>2023-12-13 19:52:17 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-13 19:52:17 +0000
commit6849e6d91ff4dbff3f223863fec4680f298b4145 (patch)
tree2ba05c4151dfdaa8d681471c110f6dbd47fdc345
parentf41822f975c918d0411c8b0d539471f3ded61c18 (diff)
parent632470639a6f7d931bf31a0b4dbac2f38ebf2861 (diff)
downloadCertInstaller-6849e6d91ff4dbff3f223863fec4680f298b4145.tar.gz
Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main am: 632470639a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/2871684 Change-Id: Ia59600711cc0ebc446f58fff8590c194d36d81a1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--robotests/Android.bp2
1 files changed, 2 insertions, 0 deletions
diff --git a/robotests/Android.bp b/robotests/Android.bp
index 4e40bd7..546d280 100644
--- a/robotests/Android.bp
+++ b/robotests/Android.bp
@@ -15,4 +15,6 @@ android_robolectric_test {
java_resource_dirs: ["config"],
instrumentation_for: "CertInstaller",
+
+ upstream: true,
}