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

Skip to content
Commit 79c66383 authored by Xin Li's avatar Xin Li
Browse files

resolve merge conflicts of 77a40ed8 to qt-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I0e195f5015a7b8b480686749a93d44dff43454c2
parents 9ac3bb2a 77a40ed8
Hide 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