tree d35c55c6dfd6348085f76d3a12dc8f6b8e4d98c8
parent 05d698fffd2f124703d18bc6aa01f24302d51250
parent 1d75f9c7a3f8ec5ba8ee4ac5511d2a8a5aeb9e40
author Roshan Pius <rpius@google.com> 1488239475 +0000
committer android-build-merger <android-build-merger@google.com> 1488239475 +0000

Merge changes from topic 'turn_on_supplicant_hidl' am: 91de517046 am: ec4c129044
am: 1d75f9c7a3

Change-Id: Idb5fcc9038d76fb8f302f07f69c31ff941c9567a