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

Skip to content
Commit b4de58b9 authored by Felipe Leme's avatar Felipe Leme
Browse files

resolve merge conflicts of cf612f44 to master 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ic88c2a622833353ae1dffce45dbbededb0d85b6c
parents 4a6821e9 cf612f44
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment