tree b0496e94a5b3d55947a80519e1e01510880288c4
parent 6daaf1ac9bd9d473338e0bb4421a386e548f95b5
author Michael Hablich <hablich@chromium.org> 1436787515 +0200
committer Michael Hablich <hablich@chromium.org> 1436787539 +0000

Version 4.6.1.1 (cherry-pick)

Merged 530e36d7b306fa5a7afb637e605f40cca35256fc

Correctly handle the case when TimerTask is destroyed with being run.

BUG=chromium:508584
LOG=N
R=machenbach@chromium.org

Review URL: https://codereview.chromium.org/1236463003 .

Cr-Commit-Position: refs/heads/4.6.1@{#2}
Cr-Branched-From: 377ea534703c5c9bffd407bd8d6d22177bba225f-refs/heads/master@{#29575}