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

Commit 79c66383 authored by Xin Li's avatar Xin Li
Browse files

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

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I0e195f5015a7b8b480686749a93d44dff43454c2
parents 9ac3bb2a 77a40ed8

OWNERS

+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