From: Yabin Cui <yabinc@google.com>
Date: Sat, 21 Nov 2015 01:58:36 +0000 (+0000)
Subject: Merge "Use FUTEX_WAIT_BITSET to avoid converting timeouts." am: 74ed96d597
X-Git-Tag: android-x86-7.1-r1~258^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f966ce519b;p=android-x86%2Fbionic.git

Merge "Use FUTEX_WAIT_BITSET to avoid converting timeouts." am: 74ed96d597
am: 4469973bfb

* commit '4469973bfbfc672e006a24242a149c2e03d623f1':
  Use FUTEX_WAIT_BITSET to avoid converting timeouts.
---

f966ce519b3429302a940646328fb1fc419cd19d