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

Commit 11762974 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

resolve merge conflicts of 3899c91c to qt-r1-dev-plus-aosp 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I78df438c9331897d32f6f8554a3c290532e9de85
parents e04bf380 3899c91c
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