Merge changes I0d9f18d1,Ib96c9161

author Mathias Agopian <mathias@google.com>

Wed, 24 Apr 2013 10:25:33 +0000 (10:25 +0000)

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

Wed, 24 Apr 2013 10:25:34 +0000 (10:25 +0000)
author Mathias Agopian <mathias@google.com>
Wed, 24 Apr 2013 10:25:33 +0000 (10:25 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 24 Apr 2013 10:25:34 +0000 (10:25 +0000)
diff --cc include/gui/GLConsumer.h
Simple merge
diff --cc libs/gui/GLConsumer.cpp
Simple merge
author	Mathias Agopian <mathias@google.com>
	Wed, 24 Apr 2013 10:25:33 +0000 (10:25 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 24 Apr 2013 10:25:34 +0000 (10:25 +0000)
		1	2
include/gui/GLConsumer.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/gui/GLConsumer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history