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

Skip to content
Commit 97638812 authored by David Gross's avatar David Gross
Browse files

resolve merge conflicts of 414cd0d7 to master 

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I159f9515705fb557d236675b0f118a607a00c60d
parents 5c574848 414cd0d7
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