Merge "Zen priority settings update" into oc-dr1-dev

author Julia Reynolds <juliacr@google.com>

Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)

committer android-build-merger <android-build-merger@google.com>

Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
author Julia Reynolds <juliacr@google.com>
Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
committer android-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/notification/ZenModeSettings.java
Simple merge
author	Julia Reynolds <juliacr@google.com>
	Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/notification/ZenModeSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history