Merge "Wrap ViewGroup content in save/restore to protect composited children"

author Chris Craik <ccraik@google.com>

Fri, 20 Jun 2014 23:21:20 +0000 (23:21 +0000)

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

Fri, 20 Jun 2014 02:09:17 +0000 (02:09 +0000)
author Chris Craik <ccraik@google.com>
Fri, 20 Jun 2014 23:21:20 +0000 (23:21 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Jun 2014 02:09:17 +0000 (02:09 +0000)
diff --cc libs/hwui/DisplayListOp.h
Simple merge
diff --cc libs/hwui/Layer.cpp
Simple merge
diff --cc libs/hwui/OpenGLRenderer.cpp
Simple merge
diff --cc libs/hwui/RenderNode.cpp
Simple merge
diff --cc libs/hwui/RenderNode.h
Simple merge
author	Chris Craik <ccraik@google.com>
	Fri, 20 Jun 2014 23:21:20 +0000 (23:21 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Jun 2014 02:09:17 +0000 (02:09 +0000)
		1	2
libs/hwui/DisplayListOp.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/Layer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/OpenGLRenderer.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/RenderNode.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/RenderNode.h	patch \|	diff1 \|	diff2 \|	blob \| history