OSDN Git Service

am e1b25377: am 998d7b03: Merge "Fix deadlock in timer_delete."
authorChristopher Ferris <cferris@google.com>
Mon, 24 Mar 2014 17:27:10 +0000 (17:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 24 Mar 2014 17:27:10 +0000 (17:27 +0000)
commit7eec58344516f483fb7fa941ab06f5a12504fd3a
tree1ef91129a8277622f3ea9d5175aeef944f13bb86
parente3fb244f7ae8eb24104132a5fb8337c78d5e2fc1
parente1b25377387376932688bb436393764469af1cf3
am e1b25377: am 998d7b03: Merge "Fix deadlock in timer_delete."

* commit 'e1b25377387376932688bb436393764469af1cf3':
  Fix deadlock in timer_delete.