Merge changes from topics 'id_str_supplicant_hidl', 'p2p_wps_supplicant_hidl'

am: 639bb13553

Change-Id: I7748acb54fc999001d816a39519ff15ced186682
This commit is contained in:
Roshan Pius 2017-01-19 22:55:31 +00:00 committed by android-build-merger
commit 30655b57be

Diff content is not available