tree 04a10e3a56ef7b7b5a0f75a417b3c57940d2f443
parent 7f5609b5104fa8641b558c6a294851092b4ba4c3
parent 01f1787671637e9dc3ed184fc38c8d8c8e5d175a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582858172 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1582858172 +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: 01f1787671

Change-Id: I876abd3bcbafc26d6f64c7afb1db45dbe3f8297e