Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into master_merge

author Prerepa Viswanadham <dham@google.com>

Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)

committer Prerepa Viswanadham <dham@google.com>

Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)
author Prerepa Viswanadham <dham@google.com>
Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)
committer Prerepa Viswanadham <dham@google.com>
Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)
diff --cc include/hardware_legacy/wifi_hal.h
Simple merge
diff --cc include/hardware_legacy/wifi_logger.h
Simple merge
author	Prerepa Viswanadham <dham@google.com>
	Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)
committer	Prerepa Viswanadham <dham@google.com>
	Tue, 24 Mar 2015 21:47:37 +0000 (14:47 -0700)
		1	2
include/hardware_legacy/wifi_hal.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/hardware_legacy/wifi_logger.h	patch \|	diff1 \|	diff2 \|	blob \| history