tree 06260b92df3f65c201b175017e3f7a9cde56a1b1
parent 62daffe147e8810ce48a897df46b0b3db95ebaa3
parent d041bf2095f5f133c87f7ba632a8dfb39537a437
author Jean-Baptiste Queru <jbq@google.com> 1330028950 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330028950 -0800

am d041bf20: Merge "bionic/x86: fix one potential deadlock in __set_tls()"

* commit 'd041bf2095f5f133c87f7ba632a8dfb39537a437':
  bionic/x86: fix one potential deadlock in __set_tls()