tree d1b46162b9e64064a4e6c52467a92fc17d73ad67
parent c0fd643c8bc5928eebefcdaf97352ba1f11448b0
parent 7c797fbf198378b547daa8fbb86f11c9d9c77f99
author James Lemieux <jplemieux@google.com> 1464385408 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1464385408 +0000

Merge "Show chronometer in expired timer notification" into ub-deskclock-fantasy