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

Commit 3d5d9e3a authored by Xin Li's avatar Xin Li Committed by android-build-merger
Browse files

resolve merge conflicts of 77a40ed8 to...

resolve merge conflicts of 77a40ed8 to qt-dev-plus-aosp am: 79c66383
am: b187cd2c

Change-Id: Id70a1aba21393561ae054acb7aeaef482cfd4cce
parents 1fa631e7 b187cd2c
Loading
Loading
Loading
Loading
+5 −4
Original line number Diff line number Diff line
set noparent

codewiz@google.com
jchalard@google.com
junyulai@google.com
lorenzo@google.com
baligh@google.com
delphij@google.com
reminv@google.com
satk@google.com