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

Commit 6e7213b0 authored by Ivan Podogov's avatar Ivan Podogov
Browse files

resolve merge conflicts of be249e46 to master 

Test: make
Change-Id: I7d49e2c1480e3296f8de25d5e8e94db7b58dd8f5
parents f1c23156 be249e46
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