aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-03-08 10:19:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-08 10:19:21 +0000
commit8bfd5cab04c9adb734353ac05db9f3799bae9b33 (patch)
tree30da0899c053e1bd304954394b191b242bae4bd0
parentee5e07ca3d293db7fdfb9350c2b1cf63115f3fbd (diff)
parent752369949bbcfede8d3d15dbea75fd753a637c12 (diff)
downloadrobolectric-shadows-8bfd5cab04c9adb734353ac05db9f3799bae9b33.tar.gz
[automerger skipped] Merge Android 12L am: 752369949b -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: I2968083a3598773b75c36f9ffe7fea15b623a1e4
0 files changed, 0 insertions, 0 deletions