tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent adca17539c36914cdfe8f8f97c5272beed96bb0a
parent 948e8d32ddc7405665fb5b97031e0e8b1d24f46c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582859039 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582859039 +0000

[automerger skipped] hidl/1.2: Don't set WPA_KEY_MGMT_FT_SAE key management. am: bd90854778 -s ours am: 1fc679c6db am: de02e51522 am: 3a97d05ca4 am: 948e8d32dd

Change-Id: I533b58e2e504e1b1ecc46ad79cceab1012a41088