| commit | d856afec47c069fe117cdf6c3e22c3d066565a11 | [log] [tgz] |
|---|---|---|
| author | John Spurlock <jspurlock@google.com> | Tue Oct 28 18:08:11 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 28 18:08:11 2014 +0000 |
| tree | cbfd3508b9da444f580ef6e6bad7853724dac547 | |
| parent | aeb0a9dba297a027344bc91e8b9e33c84c450876 [diff] | |
| parent | 93e40ba6c4373402c7c4f430e3e575e4a0cc13eb [diff] |
am ee990413: Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev automerge: 93e40ba * commit '93e40ba6c4373402c7c4f430e3e575e4a0cc13eb': Zen: Show "(until 4:56 PM)" in exit conditions.