OSDN Git Service

am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat...
authorJohn Spurlock <jspurlock@google.com>
Mon, 1 Jun 2015 15:26:31 +0000 (15:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:26:31 +0000 (15:26 +0000)
commit57436577e2771cd4ff81c88d93362325ecd3a8c7
treec6c2d8955be22602548f433248117a7fee934583
parent3e83ea3f117e3509bcd869141abf2fe0302d0264
parentf1b897e8b5793430a1c28e66df7e4d346cd9a9a4
am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

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