Merge "WifiHal: Add support to accept either passphrase or pmk"
am: 2931ad23a4

Change-Id: I5fc6a53d2419d863d4d1a55caa7cc85171819f16
tree: b6c59ff90afa7a4665b80f5c3f693d871d798833
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk