Merge "SurfaceFlinger: setGeometryAppliesWithResize crop latching fixes." into oc-dev

author Robert Carr <racarr@google.com>

Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)

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

Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)
author Robert Carr <racarr@google.com>
Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)
diff --cc services/surfaceflinger/Layer.cpp

index b828d6a,d5498ed..bdd6ce8

mode 100755,100644..100755
--- 1/services/surfaceflinger/Layer.cpp
--- 2/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
author	Robert Carr <racarr@google.com>
	Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 23 May 2017 04:14:52 +0000 (04:14 +0000)