tree c20895c0aa4f8f343b4ba9dfeadd286c074adae0
parent 932f8110644a2b79d51a03e122ed1e461577dd4b
parent ee73174022f7b163d1446e732f09c8b15ddc13e7
author Roshan Pius <rpius@google.com> 1489768533 +0000
committer android-build-merger <android-build-merger@google.com> 1489768533 +0000

Merge "wpa_supplicant(hidl): Add support for disabling auto connect" am: 8d197ca3fb
am: ee73174022

Change-Id: I7c4e379294648b4dd9220f3033907b630c503a45