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

Commit 49e4f4ca authored by George Chan's avatar George Chan
Browse files

Resolved merge conflict on OWNERS file. 

Test: N/A
Change-Id: I9fd55c11b177d7e0910f3e52ab67902bb8109745
parent 7a652deb

core/java/android/content/pm/OWNERS

+1 −0
Original line number Diff line number Diff line
@@ -10,3 +10,4 @@ per-file *Launcher* = file:/core/java/android/content/pm/LAUNCHER_OWNERS 
per-file UserInfo* = file:/MULTIUSER_OWNERS

per-file *UserProperties* = file:/MULTIUSER_OWNERS

per-file *multiuser* = file:/MULTIUSER_OWNERS

per-file IBackgroundInstallControlService.aidl = file:/services/core/java/com/android/server/pm/BACKGROUND_INSTALL_OWNERS