OSDN Git Service

Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
authorJulia Reynolds <juliacr@google.com>
Mon, 9 Apr 2018 19:18:36 +0000 (12:18 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 9 Apr 2018 19:18:36 +0000 (12:18 -0700)
commit65fe2137d8188c2ba3de0ce90acb9d3279ddd09b
treebe6e1514cba62006cd2043fecbcce44f9d3049d5
parentdf2b3c6d189c709ec129d0e81d7327932a8be17b
parent2b5d069d4b245978277bce9cbd7a7412e575234d
Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53
am: 2b5d069d4b

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