Merge "Add support for unique_fds and vectors of file descriptors" am: b1819fc295...

author Casey Dahlin <sadmac@google.com>

Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)

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

Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)
author Casey Dahlin <sadmac@google.com>
Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)
diff --cc libs/binder/Android.mk
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Casey Dahlin <sadmac@google.com>
	Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 19 Nov 2015 05:46:48 +0000 (05:46 +0000)
		1	2
libs/binder/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history