Commit 274f5e73 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am efd2ec8f: Merge "Fix race condition in timer disarm/delete." 

* commit 'efd2ec8f':
  Fix race condition in timer disarm/delete.
parents 4b8c96d6 efd2ec8f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment