Merge "Revert "libbinder: Replace ScopedFd with base::unique_fd"" am: dcc5575

author Christopher Wiley <wiley@google.com>

Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)

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

Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
author Christopher Wiley <wiley@google.com>
Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
diff --cc include/binder/Parcel.h
Simple merge
diff --cc libs/binder/Android.mk
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Christopher Wiley <wiley@google.com>
	Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 18 Apr 2016 17:57:25 +0000 (17:57 +0000)
		1	2
include/binder/Parcel.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history