DO NOT MERGE. Added a is_zipping() function. am: 03974984bf

author Felipe Leme <felipeal@google.com>

Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)

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

Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)
author Felipe Leme <felipeal@google.com>
Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)
diff --cc cmds/dumpstate/dumpstate.cpp
Simple merge
diff --cc cmds/dumpstate/dumpstate.h
Simple merge
author	Felipe Leme <felipeal@google.com>
	Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 21 Oct 2016 23:56:18 +0000 (23:56 +0000)
		1	2
cmds/dumpstate/dumpstate.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
cmds/dumpstate/dumpstate.h	patch \|	diff1 \|	diff2 \|	blob \| history