Merge "Add config flag to specify if wallpaper is rendered" into pi-dev

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

Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)

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

Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/wm/DisplayContent.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 2 Apr 2018 00:19:24 +0000 (00:19 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/wm/DisplayContent.java	patch \|	diff1 \|	diff2 \|	blob \| history