tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent c22f95f6c4f3da120c2b40d98860573358d724ed
parent 1fc679c6db4cee8c7d6b421dce1d48659f3b1608
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582856863 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582856863 +0000

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

Change-Id: If4f1aa1a970906f5ba6977cfcda3db2e368aa7dd