OSDN Git Service

Merge "Localization of zen mode default rules." into oc-mr1-dev
authorBeverly <beverlyt@google.com>
Thu, 10 Aug 2017 16:49:36 +0000 (16:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 10 Aug 2017 16:49:36 +0000 (16:49 +0000)
am: 15ea142044

Change-Id: I28ad1c56e5bd1b9c7eec2cee336e22e5d7c0b6af


Trivial merge