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

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

resolve merge conflicts of 0d6eca0e to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Id762ceddec08446d76769ea5c7a2a791ed6fd1c8
parents 66d1eef2 0d6eca0e
Expand all Show 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