am aa938c8d: Merge "mDirtyRegion is single threaded, but could be accessed from a...

author Mathias Agopian <mathias@google.com>

Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)

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

Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)
author Mathias Agopian <mathias@google.com>
Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Mathias Agopian <mathias@google.com>
	Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 21 Oct 2011 23:00:00 +0000 (16:00 -0700)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history