tree 167a75b41e6e898a9879b7d81438a2db793905f3
parent cfc314f5706bd10c1f9382ca0a0a7c46a966739d
parent bf4afdb2e165ace091f845055884fe305de77798
author Xin Li <delphij@google.com> 1614816717 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614816717 +0000

[automerger skipped] Merge RQ2A.210305.007 am: cc962cc1ce -s ours am: b296d6fa3f -s ours am: bf4afdb2e1 -s ours

am skip reason: Change-Id Ice15549db37aaffa597013e22274cca76e0146bd with SHA-1 96c796a5e9 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1613665

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I52272e6cfda8b0a4e47c83c6b005b7c8d29902c6