tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent 9ba4b0af28fc43133dad5e0f4bbd386e724ae5e0
parent e1c342dd092bee6d0a6500e5c4a665977c6fef53
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582857430 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582857430 +0000

[automerger skipped] hidl/1.2: Don't set WPA_KEY_MGMT_FT_SAE key management. am: bd90854778 -s ours am: 1fc679c6db am: e1c342dd09

Change-Id: I5116ebc0cfab44a2d0b010079e2027c8e47f7ad4