Merge "Convert skpCaptureEnabled compile time flag into a property"

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)

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

Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)
diff --cc libs/hwui/pipeline/skia/SkiaPipeline.cpp
Simple merge
diff --cc libs/hwui/pipeline/skia/SkiaPipeline.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 20 Oct 2017 23:57:03 +0000 (23:57 +0000)
		1	2
libs/hwui/pipeline/skia/SkiaPipeline.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
libs/hwui/pipeline/skia/SkiaPipeline.h	patch \|	diff1 \|	diff2 \|	blob \| history