tree 91a86581977a29acca5efaa789c517ec23425232
parent 0c01555452736d7d76682702bdf64b873f6cdf29
author Craig Stout <cstout@google.com> 1481855791 -0800
committer Craig Stout <cstout@google.com> 1481918198 -0800

Fix timer problems on shutdown

Change-Id: I697081cb62445a143029d22875afac7307189fd0