tree 569fdc346816fe61024cfa1ca49033daae0edefc
parent 5eaad8882258e8f06b6aac68d85e0484ce6b76bb
parent 0d3e954cef326529162d383289692293048afc4f
author Xin Li <delphij@google.com> 1599011968 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011968 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: da0eef832c -s ours am: 4d66b11e2e -s ours am: 99d9cc8abc -s ours am: 0d3e954cef -s ours

am skip reason: Change-Id I76b1212936706a196a76c84a54dfe05b8c4899e7 with SHA-1 7cb60dfee4 is in history

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

Change-Id: I753548da57e5a59cbad7ac9aa38ed89c90cb6ee7