tree aa9ce57a4fe4e6e24aab95a0c2b087d171aafae0
parent d9735ce76d11b2608eba4b1df11bb0be8e2e4e27
parent c2979cdd9f271ac24a0239271d2d23da1d528be7
author Andrew Walbran <qwandor@google.com> 1626813046 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1626813046 +0000

Merge remote-tracking branch 'aosp/upstream-main' into mergeupstream am: e7f63d9629 am: c2979cdd9f

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vmm_vhost/+/1768745

Change-Id: I64ec66ad5a214d0792555982251a35912840ff3d