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

Skip to content
Commit 50ae6169 authored by Anton Hansson's avatar Anton Hansson
Browse files

resolve merge conflicts of bd9b116b to master 

ag/4365985 got in the way

BUG: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I2e25032645c87f084f911e14fade16bc802ff457
parents 3ef8fb31 bd9b116b
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