tree b614f0c9c9671eb6beaec448a7d22dc1ad44e298
parent 098cf45f4e853f3c85c14af0e475bfae0839f027
parent 62d84b19359a8ddd3df5b6293d1b05ef5281f532
author Christopher Ferris <cferris@google.com> 1414009985 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1414009986 +0000

Merge "Fix race condition in timer disarm/delete."