commit | 7b9626f4491f7e12c95c1ecabbd106b57b5f800e | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Sun May 25 03:17:25 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 25 03:17:25 2014 +0000 |
tree | ee8d98ca4287748c004fc65da3ba67c1f2a44a4a | |
parent | 18f89a699c0696998eb53bbcbadeda685db28429 [diff] | |
parent | 4d436a2fdc3a847571a69c22d2cfefeef29ca9a2 [diff] |
am 4d436a2f: am 85df714f: am d4f37110: Merge "Restore __futex_wake and __futex_wait for LP32." * commit '4d436a2fdc3a847571a69c22d2cfefeef29ca9a2': Restore __futex_wake and __futex_wait for LP32.