Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba549023 authored by Christopher Ferris's avatar Christopher Ferris Committed by Android Git Automerger
Browse files

am 0f2966a3: resolve merge conflicts of bc137cf4 to lmp-mr1-dev-plus-aosp. 

* commit '0f2966a3':
  Convert futex to cond wait.
parents f43499ce 0f2966a3

There are no changes