| commit | 089c6d79e3b6ad5d1f9503941cb9376596871268 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Dec 09 22:23:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 09 22:23:04 2014 +0000 |
| tree | 17c20b02ee7d8a65d2ae1f2f0413233f79dcd2eb | |
| parent | 474a23ab869b9dad6587eb6c0110a4e48a6a0dca [diff] | |
| parent | ef10307e4a4942c5867ba696e12e13556ac7a716 [diff] |
am ef10307e: am 20a46fb1: am 2ea3650d: Merge "Zen: New behavior for built-in downtime + nextalarm conditions." into lmp-mr1-dev * commit 'ef10307e4a4942c5867ba696e12e13556ac7a716': Zen: New behavior for built-in downtime + nextalarm conditions.