diff options
author | Xin Li <delphij@google.com> | 2023-12-11 23:01:00 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-12-11 23:01:00 +0000 |
commit | 2ba0f6e2b5cc00fe6f34a398b9d619fde2834f7c (patch) | |
tree | 2b454173132400e2f007905805a666ac4e35e137 | |
parent | aa61ba584241953188dbde096e452dbe68181c6c (diff) | |
parent | be2c5d0cc9c5930a58beffda3e56b3cfaf27d898 (diff) | |
download | robolectric-2ba0f6e2b5cc00fe6f34a398b9d619fde2834f7c.tar.gz |
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: ec237983ce -s ours am: 4ef109fcc4 -s ours am: be2c5d0cc9 -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: Idb1c048c5fc30efdf744da91108473d160c746b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions