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

Commit 4f429fbc authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

resolve merge conflicts of 03bef15f to qt-r1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ifdae71ce0248b0b2e4ab556b8255ced85ac0452f
parents 55748140 03bef15f
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