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

Commit 334e3431 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

Change-Id: Ib70073ce432142840cf56e974ce4321174724716
parents 4f429fbc 42563722
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