tree 0760745e3a0ca4a7d6e3fbbc4d355706c4f745b2
parent 33f466b2e1a1be346e853c443b0fe172b8435684
parent 12e495de021092b7b5cd3ba7b5c7d71c1f5ed1a5
author Kevin Liu <congxiliu@google.com> 1702500888 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702500888 +0000

[automerger skipped] Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main am: 632470639a am: 6849e6d91f am: 12e495de02 -s ours

am skip reason: Merged-In I6c3d2db9ebdf574795b3fc6f4201a55afd2a68c8 with SHA-1 cc13eb116f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/CertInstaller/+/2871684

Change-Id: I5f47a92a992f7687fc70163b0949bb48f1e00862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>