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

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

resolve merge conflicts of ed81cc26 to qt-r1-dev-plus-aosp 

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I9cc45ecad961f3aee1753679636a1919c797d7fc
parents 77abafd8 ed81cc26
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment