Merge "dumpstate: Remove FWDUMP_bcmdhd support"

author Dmitry Shmidt <dimitrysh@google.com>

Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)
author Dmitry Shmidt <dimitrysh@google.com>
Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)
diff --cc cmds/dumpstate/Android.mk
Simple merge
diff --cc cmds/dumpstate/dumpstate.cpp
Simple merge
author	Dmitry Shmidt <dimitrysh@google.com>
	Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 23 Mar 2017 00:52:59 +0000 (00:52 +0000)
		1	2
cmds/dumpstate/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/dumpstate/dumpstate.cpp	patch \|	diff1 \|	diff2 \|	blob \| history