Merge "Add support for unique_fds and vectors of file descriptors"

author Casey Dahlin <sadmac@google.com>

Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)
author Casey Dahlin <sadmac@google.com>
Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)
diff --cc libs/binder/Android.mk
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Casey Dahlin <sadmac@google.com>
	Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Wed, 18 Nov 2015 20:54:52 +0000 (20:54 +0000)
		1	2
libs/binder/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history