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

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

resolve merge conflicts of 77a40ed8 to qt-dev-plus-aosp

am: 79c66383

Change-Id: I577955837e60cfb4d09834476fb64ea4ff2cb364
parents fea5b56b 79c66383
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