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

Skip to content
Commit a5d0d86b authored by David Brazdil's avatar David Brazdil
Browse files

resolve merge conflicts of 4d213e58 to pi-dev-plus-aosp 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Merged-In: Ifa912f8751025b7de24a982a1a227a9c27d18267
Change-Id: I9dc9a1e81d9a4d82823e15d1af0cc814a1005174
parents e323532e 4d213e58
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