Revert "Track ashmem memory usage in Parcel" am: 6880307e8e am: 159a5c3372

author Ian Pedowitz <ijpedowitz@google.com>

Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)

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

Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)
author Ian Pedowitz <ijpedowitz@google.com>
Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)
diff --cc include/binder/Parcel.h
Simple merge
diff --cc libs/binder/Parcel.cpp
Simple merge
author	Ian Pedowitz <ijpedowitz@google.com>
	Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 22 Oct 2015 22:38:23 +0000 (22:38 +0000)
		1	2
include/binder/Parcel.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/binder/Parcel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history