am e36eed77: Fix deSpinBarrier deadlock.
authorJarkko Pöyry <jpoyry@google.com>
Tue, 19 May 2015 19:51:30 +0000 (19:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 19:51:30 +0000 (19:51 +0000)
* commit 'e36eed77c8eaf42b32ebec458eb73682c5580f38':
  Fix deSpinBarrier deadlock.


Trivial merge