| commit | f4a53c6d594d1a6b13d26e32ae55e09be0fd2ce1 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Nov 11 18:39:34 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 11 18:39:34 2014 +0000 |
| tree | c5a2bb238c4e1a910440d3bf08fdcdc567dc8efb | |
| parent | ed226077809a109a8426e77dee3db7c740f61fa1 [diff] | |
| parent | 6044b5f39420a214258948198997a1b17458dd49 [diff] |
am 6044b5f3: am 73546e53: Merge "Zen: Exit downtime on next alarm (if mode=none)." into lmp-mr1-dev automerge: 3069aa2 * commit '6044b5f39420a214258948198997a1b17458dd49': Zen: Exit downtime on next alarm (if mode=none).