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

Skip to content
Commit b97b07e5 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

resolve merge conflicts of 9515c23e to klp-modular-dev am: 91b48c37 -s ours am: adc3bcb1 

am: 7e105203

* commit '7e105203':
  debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
parents 505a4314 7e105203
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment