OSDN Git Service

am 998d7b03: Merge "Fix deadlock in timer_delete."
authorChristopher Ferris <cferris@google.com>
Fri, 21 Mar 2014 17:39:10 +0000 (17:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 17:39:10 +0000 (17:39 +0000)
commitfe0f7a7944642cb3e1ba2c8be331a946468b34bc
tree6eedabf25b6c892f6eb95b847e3100c8245dcacf
parent1b3e9f45fad32c1384a92388c007c024e7ec8c26
parent998d7b030763e8da6ff04020eedab552857587d2
am 998d7b03: Merge "Fix deadlock in timer_delete."

* commit '998d7b030763e8da6ff04020eedab552857587d2':
  Fix deadlock in timer_delete.