tree 252152ed2f4f610f0cf8a830ee7c09ddcad777d3
parent 56798bc92b4afe006e1d717d87c07a8232c20a6b
parent badb90b5e1fa931db265f39d5e368847e765bd31
author Xin Li <delphij@google.com> 1624257772 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1624257772 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d83838d918 -s ours am: badb90b5e1 -s ours

am skip reason: Merged-In I329e495f244ca88a6614fab3556eb1267720d35f with SHA-1 65199c0c88 is already in history

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

Change-Id: I1ed6a70ff6b03fcbe174d5bc53aad63803835ea5