aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-11 22:02:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 22:02:31 +0000
commit70e74143330f3fda0685701329a70ee25fa999f7 (patch)
tree2b454173132400e2f007905805a666ac4e35e137
parentd9b570813e7fea6be0f47d8566ad4ae8d849b010 (diff)
parent64865dcda6748cfaa6483eae3155d49bbf26e360 (diff)
downloadrobolectric-70e74143330f3fda0685701329a70ee25fa999f7.tar.gz
[automerger skipped] Merge Android 14 QPR1 am: 849dc7e2fb -s ours am: 64865dcda6 -s ours
am skip reason: Merged-In If325c419ef92cd97af7fdba201e29f8b78636c5d with SHA-1 9bc68f90ba is already in history Original change: https://android-review.googlesource.com/c/platform/external/robolectric/+/2863530 Change-Id: I1676be871492522a9843f3acd84ad17c7b06b1af Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions