Merge "Random hacks to make QS DND work" into oc-dev am: 28355df745

author Jason Monk <jmonk@google.com>

Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)

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

Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)
author Jason Monk <jmonk@google.com>
Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)
diff --cc packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
Simple merge
author	Jason Monk <jmonk@google.com>
	Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 30 May 2017 23:31:57 +0000 (23:31 +0000)