tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent 58401b3581f41195a5a8e1b2399614662d8fd3e7
parent 5e1db366c416950702c91fa05031ebf6fe97241c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582858190 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582858190 +0000

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

Change-Id: I53347c73af45df2c5886ccfffef33317868df72e