Merge "Fix struct vs. class mismatch in forward definitions" am: 8cdcd15c38 am: 5c942...

author Colin Cross <ccross@android.com>

Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)

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

Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)
author Colin Cross <ccross@android.com>
Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)
diff --cc include/gui/ISurfaceComposer.h
Simple merge
diff --cc include/gui/SurfaceComposerClient.h
Simple merge
author	Colin Cross <ccross@android.com>
	Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 28 Sep 2016 21:21:09 +0000 (21:21 +0000)
		1	2
include/gui/ISurfaceComposer.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/gui/SurfaceComposerClient.h	patch \|	diff1 \|	diff2 \|	blob \| history