OSDN Git Service

Merge "Zen priority settings update" into oc-dr1-dev
authorJulia Reynolds <juliacr@google.com>
Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 14:23:51 +0000 (14:23 +0000)
commitb49578e4854d2ccddd3f399be942b3008da7bd29
treef316c117f5cc0efa2a478111c7d40bd122f8ab38
parent5984c71af23726c7e72b7422da1cc646342a28bc
parent9dec71f7d7364efe07ce959be8e363ad5bc9327a
Merge "Zen priority settings update" into oc-dr1-dev
am: 9dec71f7d7

Change-Id: I81e2609637537413bfd36ed9e0658d49d533a9cd
res/values/strings.xml
src/com/android/settings/notification/ZenModeSettings.java