tree 880c0a1b498e791cb5e012263af8d8a5788eb4d9
parent 5422d9fcc948cb79bf0f3d6c2d1ae2664ea9f624
parent f0c2f80e281ed87ed6fea1dd79f9475bed419cf8
author Xin Li <delphij@google.com> 1598992620 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992620 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: f0c2f80e28 -s ours

am skip reason: Change-Id If760894c9bf20ac59238cc75759d4bfc29ec2549 with SHA-1 6e14f5baf2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/robolectric-shadows/+/12470013

Change-Id: Idc4233893828b2ab8503d677ae726a4c50e2b725