Merge "SurfaceFlinger: Prevent deadlock by updating an atomic layer set." into lmp-dev

author Eric Penner <epenner@google.com>

Thu, 31 Jul 2014 18:31:37 +0000 (18:31 +0000)

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

Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
author Eric Penner <epenner@google.com>
Thu, 31 Jul 2014 18:31:37 +0000 (18:31 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
diff --cc services/surfaceflinger/Layer.h
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
author	Eric Penner <epenner@google.com>
	Thu, 31 Jul 2014 18:31:37 +0000 (18:31 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 29 Jul 2014 21:36:00 +0000 (21:36 +0000)
		1	2
services/surfaceflinger/Layer.h	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history