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