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

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

resolve merge conflicts of 1a752ce6 to qt-r1-dev am: 42563722 

am: 334e3431

Change-Id: I59791f593f09d5fee8f22748fbd043e3f55e25d6
parents aad9d109 334e3431
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