diff options
| author | 2024-02-02 06:48:48 +0000 | |
|---|---|---|
| committer | 2024-02-02 06:51:32 +0000 | |
| commit | 49e4f4ca4092baba746b9f44aa3c213cd16c6c74 (patch) | |
| tree | a1f02ed8d854cbcd12b48ad7a374c0ec445cf2b6 | |
| parent | 7a652deb35928402060ccdcd733c7bef3b613f9b (diff) | |
Resolved merge conflict on OWNERS file.
Test: N/A
Change-Id: I9fd55c11b177d7e0910f3e52ab67902bb8109745
| -rw-r--r-- | core/java/android/content/pm/OWNERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/content/pm/OWNERS b/core/java/android/content/pm/OWNERS index 53dd3bffe06c..fb9560889507 100644 --- a/core/java/android/content/pm/OWNERS +++ b/core/java/android/content/pm/OWNERS @@ -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 |