| commit | 20a46fb14fa961638c0c155ea58e75ba5e33bb4e | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Mon Dec 08 16:52:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 16:52:49 2014 +0000 |
| tree | 0a8640aea592c137ecdc83075d698bab24d24bd7 | |
| parent | fb293b9f9d7d7adb6936f526c4af9d20616c8f62 [diff] | |
| parent | 2ea3650d18ab0ce4dba2cee101d639400b411452 [diff] |
am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev * commit '2ea3650d18ab0ce4dba2cee101d639400b411452': Zen: New behavior for built-in downtime + nextalarm conditions.