Merge "Add custom dnd pages for each dnd auto rule"

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

Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)

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

Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)
diff --cc res/values/arrays.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 21 Dec 2018 21:16:38 +0000 (21:16 +0000)
		1	2
res/values/arrays.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history