tree 4cd4af5f694d764a44894756a01dd00bd8d1c978
parent 9d9a2d7752cf991218647a3c9dbe3d88a7548457
parent d5cf738427f1e543295c0d147083a9c4d41ed491
author Xin Li <delphij@google.com> 1633679826 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679826 +0000

[automerger skipped] Merge Android 12 am: b53e87e98d -s ours am: 061b1d8cf3 -s ours am: d5cf738427 -s ours

am skip reason: Merged-In I2ac7806f0bb0d27264b2b7265fae95e9d4ee8f75 with SHA-1 41693aaf89 is already in history

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

Change-Id: Ibb24212aa96ee799226d6b3394a5d641cd25f4de