Merge "libbinder: Replace ScopedFd with base::unique_fd" am: 747c0bb

author Treehugger Robot <treehugger-gerrit@google.com>

Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +0000)

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

Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +0000)
author Treehugger Robot <treehugger-gerrit@google.com>
Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +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	Treehugger Robot <treehugger-gerrit@google.com>
	Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 18 Apr 2016 15:50:09 +0000 (15:50 +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