OSDN Git Service

am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm...
authorJohn Spurlock <jspurlock@google.com>
Fri, 29 May 2015 19:22:17 +0000 (19:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 19:22:17 +0000 (19:22 +0000)
* commit 'e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
  Zen: Add warning text if total silence will eat the next alarm.


Trivial merge