Merge "Guard against failed array allocation" into nyc-dev

author Christopher Tate <ctate@google.com>

Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)

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

Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)
author Christopher Tate <ctate@google.com>
Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)
diff --cc include/binder/Parcel.h
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Christopher Tate <ctate@google.com>
	Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 25 Mar 2016 21:03:00 +0000 (21:03 +0000)
		1	2
include/binder/Parcel.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history