OSDN Git Service

am 57436577: am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence...
authorJohn Spurlock <jspurlock@google.com>
Mon, 1 Jun 2015 15:46:49 +0000 (15:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jun 2015 15:46:49 +0000 (15:46 +0000)
commit950c50e7c49cfc6801d9a4c4778668d00d5c481d
tree7100ce83635fd0302689399846fb15450756d9c8
parent7135e60e1a371e61dd8a276004e14114d360affe
parent57436577e2771cd4ff81c88d93362325ecd3a8c7
am 57436577: am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

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