OSDN Git Service

Merge "Adding zen duration preference" into pi-dev
authorBeverly Tai <beverlyt@google.com>
Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)
1  2 
res/values/strings.xml

Simple merge