Commit 9b7b0d82 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android (Google) Code Review
Browse files

Merge "Fix race condition in timer disarm/delete." into lmp-mr1-dev

parents 702ab5b3 0724132c
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