Merge "WiFi HAL: add packet fate monitoring API" into mm-wireless-dev

author Mukesh Agrawal <quiche@google.com>

Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)

committer Android Partner Code Review <android-gerrit-partner@google.com>

Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)
author Mukesh Agrawal <quiche@google.com>
Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)
committer Android Partner Code Review <android-gerrit-partner@google.com>
Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)
diff --cc include/hardware_legacy/wifi_hal.h
Simple merge
diff --cc include/hardware_legacy/wifi_logger.h
Simple merge
author	Mukesh Agrawal <quiche@google.com>
	Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)
committer	Android Partner Code Review <android-gerrit-partner@google.com>
	Thu, 18 Feb 2016 00:31:47 +0000 (00:31 +0000)
		1	2
include/hardware_legacy/wifi_hal.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/hardware_legacy/wifi_logger.h	patch \|	diff1 \|	diff2 \|	blob \| history