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


Trivial merge