tree 7e0a5dde316d082a56bfcd95fc12737336e7bec1
parent 7ca4d73644284a7ffce83ba62923e46c0a29ab64
parent 52f74322b1d72d57146107f32ee2c76c421bf4b1
author Narayan Kamath <narayan@google.com> 1401300365 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401300365 +0000

am 52f74322: Merge "Revert "Lose the hand-written futex assembler.""

* commit '52f74322b1d72d57146107f32ee2c76c421bf4b1':
  Revert "Lose the hand-written futex assembler."