tree 8e02ca3208a788396e73645dfb7b4d7185a3eec0
parent 60e77bb9e108e6591afbe853de82c0947d66ad3f
parent cdf73b130eb08bedafe4838aee4c08bfbbc4edc3
author Xin Li <delphij@google.com> 1606970374 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606970374 +0000

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 924ae2e3d9 -s ours am: cdf73b130e -s ours

am skip reason: Change-Id Ie846e15f6e11a143a030f2a2c8df4a90e33affb6 with SHA-1 e42c40592e is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/13122777

Change-Id: Iac379095157da997d5555f0150b1f2fce802cab8