Merge "Add subtitle for Do not disturb" into qt-dev

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

Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)

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

Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/notification/ZenModeSliceBuilder.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 17 Apr 2019 09:08:17 +0000 (09:08 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/notification/ZenModeSliceBuilder.java	patch \|	diff1 \|	diff2 \|	blob \| history