tree 75cafa9eb26d8b54dfbbf8a1ddd10c062906bfd6
parent 95d520f160db65f90da56610eee1a047fb60fc4e
parent c90e6fe863bb5ac84612bd777d3b352f69265950
author John Spurlock <jspurlock@google.com> 1414516122 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1414516123 +0000

Merge "Zen: Show "(until 4:56 PM)" in exit conditions." into lmp-mr1-dev