tree 9c7b2643e1e8deb6d76815c50d7a115d23e3ce5c
parent a8936164fb87d15a56c13fdf72fa0debe976936e
parent 2c3933c6736020ab5a97afde564f49fde74900a7
author Roshan Pius <rpius@google.com> 1487293705 +0000
committer android-build-merger <android-build-merger@google.com> 1487293705 +0000

Merge "wpa_supplicant(hidl): Fix WPS method string"
am: 2c3933c673

Change-Id: I44a61db18789ef0bab75f27a789ed020f0cc775e