tree a1a580f65cd82feadf28d74af0ae55e639d81e81
parent 86adaa6e5d7df91d3729d4e4ac66eb09e01b365d
parent da1162758f377b19b330fdab70703fef21ded4ef
author Roshan Pius <rpius@google.com> 1489768883 +0000
committer android-build-merger <android-build-merger@google.com> 1489768883 +0000

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

Change-Id: I2926762fcaeb98e19e17bd40f098cf16cc4d3edf