mozilla-b2g/gaia — pull request #17916 by mcav (2014-04-02 18:10:48+00:00)
Title: Merge pull request #17304 from mcav/timerrest

Bug 982789 - [B2G][Clock]Set Timer intermittently starts countdown at incorrect starting point. r=millermedeiros
Conflicts:
apps/clock/js/panels/timer/main.js
apps/clock/test/marionette/timer_test.js