tree e890c8106c0f21794ef887c262746b32fe1654ce
parent e127394ece9893b3bbf74b5875ef0c3dc20e499e
parent a772e1703bc5274f96aa028d9425e6b6d9c732bb
author Roshan Pius <rpius@google.com> 1487281963 +0000
committer android-build-merger <android-build-merger@google.com> 1487281963 +0000

Merge "wpa_supplicant(hidl): New EAP phase 2 params and NFC methods"
am: a772e1703b

Change-Id: I8ef43f8516b0a8b6aac58021bcb5ee12a521aadf