tree e433b02b0a0c43efcae2d7769eefa30224783db1
parent da0eef832c3494acc84da1334e326385a74d5c71
parent c05ef900568c59aed980ee1e1b3bef08c374fd8a
author Xin Li <delphij@google.com> 1599784820 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784820 +0000

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

am skip reason: Change-Id I652dcff381201dac9ad1984809def239c64dfd40 with SHA-1 da0eef832c is in history

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

Change-Id: I0495b841b420031840196dac9152a9be2bd643c5