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

Skip to content
Commit e460e803 authored by Suren Baghdasaryan's avatar Suren Baghdasaryan
Browse files

resolve merge conflicts of cc628869 to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I64216208deb488450567f772eee95540998085a5
parents 74c4faa3 cc628869
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