Merge "SurfaceFlinger: Add mode to apply position with resize." into nyc-dev am:...

author Robert Carr <racarr@google.com>

Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)

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

Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)
author Robert Carr <racarr@google.com>
Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger_hwc1.cpp
Simple merge
author	Robert Carr <racarr@google.com>
	Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 7 Jun 2016 20:52:18 +0000 (20:52 +0000)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger_hwc1.cpp	patch \|	diff1 \|	diff2 \|	blob \| history