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

Skip to content
Commit eef66f11 authored by Pavel Maltsev's avatar Pavel Maltsev
Browse files

resolve merge conflicts of 3e942409 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4867c10c2b28298fc493020e2dc44e885837dcc
parents 4d476b3a 3e942409
Expand all 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