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

Skip to content
Commit 92e0f8f4 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... 

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

* commit 'c663d048':
  debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
parents d5cb8b41 c663d048
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