tree da3ee62e9867de1795f0708725b2dbebce7184c3
parent e6b2fcbe36b2258c77bbafd11e9b962cb787ef3e
parent e6a92a64e4f98e2a56e9e152b2519f090c2d0397
author Xin Li <delphij@google.com> 1599789771 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789771 +0000

[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours am: e6a92a64e4 -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: I6c65214492cbda07bf174e1cf7dbbc9b032995a6