diff options
author | Xin Li <delphij@google.com> | 2022-03-09 10:02:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 10:02:42 +0000 |
commit | 3eeba7f916e767f8fdf90a8c5be94d1f9e39370f (patch) | |
tree | 6257afb580b91132ff3033b07482d24f263b70a8 | |
parent | e57ea45f2305a91cf6db8873582ddf5090e9044a (diff) | |
parent | beb3adf6b4d395602324ddcc125d9cc990ca8c66 (diff) | |
download | robolectric-shadows-3eeba7f916e767f8fdf90a8c5be94d1f9e39370f.tar.gz |
[automerger skipped] Merge Android 12L am: 752369949b -s ours am: 8bfd5cab04 -s ours am: beb3adf6b4 -s ours
am skip reason: Merged-In I98027b4a32f09657b009128742dbebc670f4dc70 with SHA-1 ee5e07ca3d is already in history
Original change: https://android-review.googlesource.com/c/platform/external/robolectric-shadows/+/2013252
Change-Id: Ib0d640eb697c3b3d9de51f195be100498ed2d6b1
0 files changed, 0 insertions, 0 deletions