Merge "Revert "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes....

author Rob Carr <racarr@google.com>

Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)

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

Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)
author Rob Carr <racarr@google.com>
Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)
diff --cc services/surfaceflinger/Layer.cpp
Simple merge
diff --cc services/surfaceflinger/Layer.h
Simple merge
diff --cc services/surfaceflinger/LayerRejecter.cpp
Simple merge
author	Rob Carr <racarr@google.com>
	Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 16 May 2017 20:28:09 +0000 (20:28 +0000)
		1	2
services/surfaceflinger/Layer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/Layer.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/LayerRejecter.cpp	patch \|	diff1 \|	diff2 \|	blob \| history