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

Skip to content
Commit 44046f10 authored by Baligh Uddin's avatar Baligh Uddin
Browse files

resolve merge conflicts of aef843f9 to qt-r1-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: 133225687
Change-Id: If8c3a508de7cc1a5d4d44fadbb62ec8e742dd258
parents b5b89348 aef843f9
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