tree e857f3f83d7814629d440651743e11ae223da546
parent a282829473ff0d984aee3d8f291d124b7bd5b829
parent 68a9dbca29471cacd61a3cd265987cb9bbe7198c
author Mitchell Wills <mwills@google.com> 1472690702 +0000
committer android-build-merger <android-build-merger@google.com> 1472690702 +0000

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

Change-Id: I021b4bdceadd61eac58e8f6362fa057279f75cf0