Merge "Fix concurrent writes to the hardware composer" into oc-dr1-dev

author Steven Thomas <steventhomas@google.com>

Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)
author Steven Thomas <steventhomas@google.com>
Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Steven Thomas <steventhomas@google.com>
	Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Jul 2017 00:19:04 +0000 (00:19 +0000)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history