| commit | a6670282071fb29fe7ace8e7f55c446c05b718bf | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Wed Nov 05 18:47:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 05 18:47:27 2014 +0000 |
| tree | 471e596f19ac1aa1143b42ebf2c587805dadcbce | |
| parent | 724415fc2e6dbccbe45cb0c3fce98a20bfb905e4 [diff] | |
| parent | 96171f08c121a7d15a6a8cbdb28e49c917418c1f [diff] |
am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260 * commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f': Zen: Create a new exit condition for "next alarm".