tree 6a1740201b57cdcd60fd2ad80713654836668884
parent 5732790d14b8cf04a770d2d91df3b19f0657222c
parent 3cae894fc9bd2cdf037fce10a877ab494d4f5813
author Xin Li <delphij@google.com> 1598555905 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598555905 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 303a1ec42d -s ours am: cd09336ddc -s ours am: 3cae894fc9 -s ours

am skip reason: Change-Id Ibe3042242a15cfbfa877fd29b82c8787e309ec03 with SHA-1 82b5bb71ce is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/futures-task/+/12469914

Change-Id: I292dca42846ca78641b030ad84427abc24e1c7c0