tree cf67a1f467f82e51ea72f2c95357bfa15c1a800d
parent d93008b6daf45b0e171a67c69dec925ff7153d4f
parent 2c6ce4a219f97dad156bb9897c3fade2f6e52e97
author Roshan Pius <rpius@google.com> 1491323151 +0000
committer android-build-merger <android-build-merger@google.com> 1491323151 +0000

Merge "wpa_supplicant: Use HIDL for keystore" into oc-dev am: 020aae44a7
am: 2c6ce4a219

Change-Id: I3cc226d4e8bbf8709f5485bf8329d23510bc261b