Merge "changes to SurfaceTexture needed for unification with SF"

author Mathias Agopian <mathias@google.com>

Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)

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

Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
author Mathias Agopian <mathias@google.com>
Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
diff --cc include/gui/SurfaceTexture.h
Simple merge
diff --cc libs/gui/SurfaceTexture.cpp
Simple merge
author	Mathias Agopian <mathias@google.com>
	Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 Apr 2011 02:51:26 +0000 (19:51 -0700)
		1	2
include/gui/SurfaceTexture.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/gui/SurfaceTexture.cpp	patch \|	diff1 \|	diff2 \|	blob \| history