tree daae1834de520f96105d5d88e804ebbdd12ce56a
parent b8883b660131535ec0814ed2772e7526f9ced07d
parent 39c6087ebdf91d098e58be9d8db9462a95e33beb
author Xin Li <delphij@google.com> 1633679781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679781 +0000

[automerger skipped] Merge Android 12 am: ff91a34375 -s ours am: ee3e4509ac -s ours am: 39c6087ebd -s ours

am skip reason: Merged-In I304299133d16934b75e9c7d11cacc15ea20b8ea6 with SHA-1 64557aefcc is already in history

Original change: https://android-review.googlesource.com/c/kernel/prebuilts/common-modules/virtual-device/5.4/arm64/+/1847713

Change-Id: I7135e0fdb05669996a517e53429a89947863a3d0