Merge commit '75c5de42b759bdcfa7c0e6103fb959c28d686116' into HEAD

author Bill Yi <byi@google.com>

Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)

committer Bill Yi <byi@google.com>

Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)
author Bill Yi <byi@google.com>
Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)
committer Bill Yi <byi@google.com>
Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)
diff --cc cmds/dumpstate/dumpstate.c
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Bill Yi <byi@google.com>
	Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)
committer	Bill Yi <byi@google.com>
	Tue, 3 Nov 2015 22:30:01 +0000 (14:30 -0800)
		1	2
cmds/dumpstate/dumpstate.c	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history