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

* commit '274f5e737dcae3c9d328f89f4f7df29acee41230':
  Fix race condition in timer disarm/delete.
This commit is contained in:
Christopher Ferris 2014-10-29 16:42:50 +00:00 committed by Android Git Automerger
commit c165b98adc

Diff Content Not Available