OSDN Git Service

am 274f5e73: am efd2ec8f: Merge "Fix race condition in timer disarm/delete."
authorChristopher Ferris <cferris@google.com>
Wed, 29 Oct 2014 16:42:50 +0000 (16:42 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Oct 2014 16:42:50 +0000 (16:42 +0000)
commitc165b98adc930b11c140a1c10e1eeb0ec6307ac9
treef6f30203579ab8ae95b9b581fdd60cee9141741e
parent69377b890966af4a679857caea983e4702e3b764
parent274f5e737dcae3c9d328f89f4f7df29acee41230
am 274f5e73: am efd2ec8f: Merge "Fix race condition in timer disarm/delete."

* commit '274f5e737dcae3c9d328f89f4f7df29acee41230':
  Fix race condition in timer disarm/delete.