tree e63986e1731bcd7d309d964783171fbf6b0179ce
parent 3d50b71bafe3a9a7f5184df1602bcbbabf4a637f
parent 422f38ce9c3ed1e0a6f4e9baac605821544e36b6
author Xin Li <delphij@google.com> 1633657178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657178 +0000

[automerger skipped] Merge "Merge Android 12" am: 732fbbcff0 -s ours am: 422f38ce9c -s ours

am skip reason: Merged-In I44a0f5ab28aefd2a8c9f98dbfbc682a91dbcbbba with SHA-1 b7fdde4e85 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/1847693

Change-Id: I27fd837cd68163cb5720d122a174752a534575be