| commit | 93e40ba6c4373402c7c4f430e3e575e4a0cc13eb | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Oct 28 17:17:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 28 17:17:03 2014 +0000 |
| tree | 17262ef3d1a811671743f3afb8ad6da31308b49e | |
| parent | 8a536bb4e04b8a0e4f074c744321d352d5bf08b2 [diff] | |
| parent | ee990413b51b41e4fe8940cba703bdfb56a12018 [diff] |
am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev * commit 'ee990413b51b41e4fe8940cba703bdfb56a12018': Zen: Show "(until 4:56 PM)" in exit conditions.