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

Commit bcc19239 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 

am: 55748140

Change-Id: I243a6a66b155c9c8f22ab8091f98f504f54f43d9
parents 2794758e 55748140
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