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

Skip to content
Commit f0a7b0df authored by Michael Groover's avatar Michael Groover
Browse files

resolve merge conflicts of 9c392805 to qt-qpr1-dev 

Bug: 173421434

Change-Id: I4e5dcf3b9fe03f3403275bd2ca08ff52d53c2278
Merged-In: Iab02eef23a9b34d3e5eaceaabc8affd3725f5f3c
parents 193b5584 9c392805
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