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

Commit 099e4c04 authored by Sami Tolvanen's avatar Sami Tolvanen Committed by android-build-merger
Browse files

resolve merge conflicts of dcc79d83 to nyc-dev-plus-aosp 

am: 37e394e7

* commit '37e394e7':
  Support persist.sys.audit_safemode
parents 097300bc 37e394e7
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