am 19f06de0: am 40b2a8b4: am e7d20eb0: Merge "SurfaceFlinger: Pass surface damage...

author Dan Stoza <stoza@google.com>

Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)
author Dan Stoza <stoza@google.com>
Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Dan Stoza <stoza@google.com>
	Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 15 Apr 2015 21:42:44 +0000 (21:42 +0000)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history