| commit | 58661167eebeefdd9e46c70ea10a6561f257f47b | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Nov 14 19:39:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 19:39:04 2014 +0000 |
| tree | 5ba78334b28007ef28339001ac4725b8bf769ea3 | |
| parent | 456fe3177b095bc5ecaaf4d7bbc2bc516725070a [diff] | |
| parent | 514eefd53c94b3bab67a92bc7bd859a083a918d3 [diff] |
am 514eefd5: am a46bf7eb: Merge "Convert futex to cond wait." * commit '514eefd53c94b3bab67a92bc7bd859a083a918d3': Convert futex to cond wait.