| commit | ba5490237c887a6368c5b6e8eabe181fbabc55f7 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Fri Nov 14 21:04:55 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 14 21:04:55 2014 +0000 |
| tree | 3fa1738ea4631865a750b0b7ccc2e8308de73d23 | |
| parent | f43499ce726b3c83503759df301d76bb2ce8925a [diff] | |
| parent | 0f2966a3cac3cfcd53fe09e8b2b6e60b5c5958f1 [diff] |
am 0f2966a3: resolve merge conflicts of bc137cf to lmp-mr1-dev-plus-aosp. * commit '0f2966a3cac3cfcd53fe09e8b2b6e60b5c5958f1': Convert futex to cond wait.