Merge "fix [3312683] Camera mirroring problem after switching from back to front...

author Mathias Agopian <mathias@google.com>

Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)

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

Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)
author Mathias Agopian <mathias@google.com>
Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)
diff --cc services/surfaceflinger/SurfaceFlinger.cpp
Simple merge
diff --cc services/surfaceflinger/SurfaceFlinger.h
Simple merge
author	Mathias Agopian <mathias@google.com>
	Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 14 Jan 2011 18:54:47 +0000 (10:54 -0800)
		1	2
services/surfaceflinger/SurfaceFlinger.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/surfaceflinger/SurfaceFlinger.h	patch \|	diff1 \|	diff2 \|	blob \| history