am e782a8d1: am 621e5d6e: Merge "Fix NPE when stopping off-screen times-up timers" into jb-mr1-dev
am e782a8d1: am 621e5d6e: Merge "Fix NPE when stopping off-screen times-up timers" into jb-mr1-dev

* commit 'e782a8d130642477a1ff9270e8117e7e89804054':
  Fix NPE when stopping off-screen times-up timers

OrBin/SynClock-Android,dseuss/deskclock,dseuss/deskclock