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

Commit 6e77c12b authored by George Chan's avatar George Chan Committed by Automerger Merge Worker
Browse files

Resolved merge conflict on OWNERS file. am: 49e4f4ca 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26111868



Change-Id: I1a2a5d723a142d5ba2faedd4eca413c2cfc34856
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3f1fef89 49e4f4ca

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