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

Skip to content
Commit 4c1f6da0 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

resolve merge conflicts of 8a3b8221 to qt-r1-dev-plus-aosp 

am: e943d5ed

Change-Id: Icc242fc1ba38955868ad9bf5e3ab82b242b3c24d
parents c5b72ce4 e943d5ed
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