tree 6a1740201b57cdcd60fd2ad80713654836668884
parent 0b93b134421b906bdf579001a64abc1cee57cf78
parent cd09336ddc639eb88b34a9e657b2a4ba162f663b
author Xin Li <delphij@google.com> 1598554650 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598554650 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 303a1ec42d -s ours am: cd09336ddc -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: Icdee26885537b612946538cd1937b3137e85edb5