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

Skip to content
Commit acb25a1d authored by Pavel Zhamaitsiak's avatar Pavel Zhamaitsiak
Browse files

resolve merge conflicts of 5a1e5ede to master. 

Change-Id: Ie980796ac4f02e82d6d734e5e124fb885302e18d
parents a539a570 5a1e5ede
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