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

Commit 5704f326 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of f05f7ab1 to master 

Change-Id: Id39b4f1f0aefb387261bbe721050814d5517cea1
parents 70cdb408 85e70956
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