| commit | e648c5f1cb41f72a3404a9a7d2656e764c52f8e1 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Fri May 29 18:07:35 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 29 18:07:36 2015 +0000 |
| tree | fe1816526e2faeaa550a54da17c0ee870c1979f9 | |
| parent | 1a23c31752f1295c708cf749a7828dc42e4e9d9e [diff] | |
| parent | 8be53eaaf7b2dcc5617c6ed6bef14d15cbe9e28d [diff] |
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev