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

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

am 6866d32f: resolved conflicts for merge of cd206b39 to mnc-dev-plus-aosp 

* commit '6866d32f':
  Fix gettid() on Windows.
parents 293ffd83 6866d32f
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment