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

Skip to content
Commit 3fe668a0 authored by Geoffrey Pitsch's avatar Geoffrey Pitsch
Browse files

resolve merge conflicts of 180f4ee7 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic6a7751e75899c5faf32bb2b392fa623d6482e7b
parents 75e7ee93 180f4ee7
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