From: Christopher Ferris <cferris@google.com>
Date: Mon, 24 Mar 2014 17:27:10 +0000 (+0000)
Subject: am e1b25377: am 998d7b03: Merge "Fix deadlock in timer_delete."
X-Git-Tag: android-x86-6.0-r1~1658
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7eec58344516f483fb7fa941ab06f5a12504fd3a;p=android-x86%2Fbionic.git

am e1b25377: am 998d7b03: Merge "Fix deadlock in timer_delete."

* commit 'e1b25377387376932688bb436393764469af1cf3':
  Fix deadlock in timer_delete.
---

7eec58344516f483fb7fa941ab06f5a12504fd3a