Merge "Better handle op size edge cases"

author Chris Craik <ccraik@google.com>

Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)

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

Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)
author Chris Craik <ccraik@google.com>
Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)
diff --cc libs/hwui/DeferredDisplayList.cpp
Simple merge
diff --cc libs/hwui/OpenGLRenderer.cpp
Simple merge
diff --cc libs/hwui/OpenGLRenderer.h
Simple merge
author	Chris Craik <ccraik@google.com>
	Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 17 Jun 2013 21:02:56 +0000 (21:02 +0000)
		1	2
libs/hwui/DeferredDisplayList.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/OpenGLRenderer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/OpenGLRenderer.h	patch \|	diff1 \|	diff2 \|	blob \| history