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

Skip to content
Commit e45aae69 authored by Risan's avatar Risan
Browse files

resolve merge conflicts of 6c9537dc to master 

Bug: None
Test: I solemnly swear I tested this conflict resolution (presubmit).
Change-Id: Ic8bf52c913caa7ed6bd91aa7dfb95a4cc2032249
parents 14540159 6c9537dc
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