tree da3ee62e9867de1795f0708725b2dbebce7184c3
parent 0b2dbb46216394e1a543dec6e94adf43f35c9da9
parent 7bddc5a99826911a74a0ceef4112813ae5b0217c
author Xin Li <delphij@google.com> 1599784832 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784832 +0000

[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours

am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history

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

Change-Id: I6b2de33adeec2ea771285910e411f494a841310e