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)
commitf1b897e8b5793430a1c28e66df7e4d346cd9a9a4
tree0853073d3fb0ceda1069c7c014209f2161078d48
parent97e7fec63ca3c72516e478b158e9673bdfc0118f
parente648c5f1cb41f72a3404a9a7d2656e764c52f8e1
am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

* commit 'e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
  Zen: Add warning text if total silence will eat the next alarm.