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

Commit 2db76a07 authored by Nicolas Geoffray's avatar Nicolas Geoffray
Browse files

resolve merge conflicts of 0fc2ec4e to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I393649fb7e6357b0190a55626aeb9ce4d21785a3
parents ae739a05 0fc2ec4e
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