tree b6c59ff90afa7a4665b80f5c3f693d871d798833
parent c21a70798681a9e4d5c857956398ba401364e3c2
parent 2931ad23a47db7f20615db07908254f2d717c0d8
author Etan Cohen <etancohen@google.com> 1490228792 +0000
committer android-build-merger <android-build-merger@google.com> 1490228792 +0000

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

Change-Id: I5fc6a53d2419d863d4d1a55caa7cc85171819f16