aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2023-12-11 21:19:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-11 21:19:58 +0000
commit4ef109fcc4488ebb078b42288d4291f46ce766fb (patch)
tree2b454173132400e2f007905805a666ac4e35e137
parent64865dcda6748cfaa6483eae3155d49bbf26e360 (diff)
parentec237983cea89507d03fb40c20d8f101dd7eb505 (diff)
downloadrobolectric-4ef109fcc4488ebb078b42288d4291f46ce766fb.tar.gz
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ec237983ce -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: I2d42aecbf52a9e7b912fc768ec14b7dd0b197ffc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions