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

Commit 55748140 authored by Stanislav Zholnin's avatar Stanislav Zholnin Committed by android-build-merger
Browse files

resolve merge conflicts of 6943a039 to qt-r1-dev 

am: 54963180

Change-Id: Iaa14abcfb1056c28a46f948695d32b969dca24e4
parents 11762974 54963180
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