tree e857f3f83d7814629d440651743e11ae223da546
parent bc9122d50a67b6be8cd1072ed7ce639c09d6de9a
parent 1a8f2a51abef3349bb6451edaac5387f1795e3f3
author Mitchell Wills <mwills@google.com> 1472690884 +0000
committer android-build-merger <android-build-merger@google.com> 1472690884 +0000

Merge "Add wificond to hikey image" am: 34de2ad72b am: 68a9dbca29
am: 1a8f2a51ab

Change-Id: Icb40657285dcf90e5de68a7fbdc4b567106ee806