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)
* commit '998d7b030763e8da6ff04020eedab552857587d2':
  Fix deadlock in timer_delete.


Trivial merge