tree 2d166b0f775b0b0d91526fc19d1d98c8984b2428
parent 9c8ad926772333b99f7d9eafb4515f1302437190
parent 6de3699d87033bf67fdda1ed97f736bb2a51636c
author Mitchell Wills <mwills@google.com> 1472500968 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472500998 +0000

Merge changes from topic 'wifi-aosp-master' into stage-aosp-master

* changes:
  Do not define superfluous wpa_supplicant service
  Label Broadcom's firmware reload path as such
  Add wificond to flounder image