Merge "Fix weak vtable warnings" am: d93a40c920 am: 11a2bcad06 am: cd77a5a218

author Colin Cross <ccross@android.com>

Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)

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

Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)
author Colin Cross <ccross@android.com>
Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)
diff --cc include/binder/IBinder.h
Simple merge
diff --cc include/binder/Parcel.h
Simple merge
diff --cc include/gui/IConsumerListener.h
Simple merge
author	Colin Cross <ccross@android.com>
	Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 30 Sep 2016 00:26:55 +0000 (00:26 +0000)
		1	2
include/binder/IBinder.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/binder/Parcel.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/gui/IConsumerListener.h	patch \|	diff1 \|	diff2 \|	blob \| history