Merge "Draw text drop shadows even when the text color is transparent" into jb-mr2-dev

author Romain Guy <romainguy@google.com>

Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)

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

Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)
author Romain Guy <romainguy@google.com>
Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)
diff --cc libs/hwui/OpenGLRenderer.cpp
Simple merge
diff --cc libs/hwui/OpenGLRenderer.h
Simple merge
author	Romain Guy <romainguy@google.com>
	Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 27 Feb 2013 22:16:22 +0000 (22:16 +0000)
		1	2
libs/hwui/OpenGLRenderer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/OpenGLRenderer.h	patch \|	diff1 \|	diff2 \|	blob \| history