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

Skip to content
Commit 88594b8b authored by Bonian Chen's avatar Bonian Chen Committed by android-build-merger
Browse files

[automerger skipped] Merge "[Settings] Fix conflict of AOSP merge" 

am: 56385ed9 -s ours
am skip reason: change_id I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3 with SHA1 c7c84d2c is in history

Change-Id: Ifaf20e18a9c5e9e8a890b4d3ffa5040c624dc0dd
parents 635c2fa0 56385ed9
Hide 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