diff options
| author | 2023-04-14 13:16:28 +0000 | |
|---|---|---|
| committer | 2023-04-14 13:16:28 +0000 | |
| commit | 10f3de20cf3a18b911ca634889707d952f152df9 (patch) | |
| tree | a201d56493bf1a74ceed78a115e4d8c06bafe600 | |
| parent | 251b591a3953aa63192e57a9af78700f06ad4f8d (diff) | |
| parent | f235652035e331b9ba551230b3b7eef11351e532 (diff) | |
Merge "Fixing owners for backup includes" am: 39760864b8 am: 21bf62d79a am: f235652035
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2525748
Change-Id: Ia591019cefd5b60f47df668befda2224c5c6d2d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SettingsProvider/src/android/provider/settings/OWNERS | 2 | ||||
| -rw-r--r-- | packages/SettingsProvider/test/src/android/provider/OWNERS | 3 | ||||
| -rw-r--r-- | services/backup/BACKUP_OWNERS | 10 | ||||
| -rw-r--r-- | services/backup/OWNERS | 10 |
4 files changed, 13 insertions, 12 deletions
diff --git a/packages/SettingsProvider/src/android/provider/settings/OWNERS b/packages/SettingsProvider/src/android/provider/settings/OWNERS index 0f888113d730..d901e2cec358 100644 --- a/packages/SettingsProvider/src/android/provider/settings/OWNERS +++ b/packages/SettingsProvider/src/android/provider/settings/OWNERS @@ -1,4 +1,4 @@ # Bug component: 656484 -include platform/frameworks/base:/services/backup/OWNERS +include platform/frameworks/base:/services/backup/BACKUP_OWNERS diff --git a/packages/SettingsProvider/test/src/android/provider/OWNERS b/packages/SettingsProvider/test/src/android/provider/OWNERS index 0f888113d730..db4b27c8bc5a 100644 --- a/packages/SettingsProvider/test/src/android/provider/OWNERS +++ b/packages/SettingsProvider/test/src/android/provider/OWNERS @@ -1,4 +1,3 @@ # Bug component: 656484 -include platform/frameworks/base:/services/backup/OWNERS - +include platform/frameworks/base:/services/backup/BACKUP_OWNERS diff --git a/services/backup/BACKUP_OWNERS b/services/backup/BACKUP_OWNERS new file mode 100644 index 000000000000..f8f4f4f4bf2e --- /dev/null +++ b/services/backup/BACKUP_OWNERS @@ -0,0 +1,10 @@ +# Bug component: 1193469 + +jstemmer@google.com +martinoh@google.com +millmore@google.com +niamhfw@google.com +piee@google.com +philippov@google.com +rthakohov@google.com +sarpm@google.com
\ No newline at end of file diff --git a/services/backup/OWNERS b/services/backup/OWNERS index 79709a3319c8..3bd2db13eea1 100644 --- a/services/backup/OWNERS +++ b/services/backup/OWNERS @@ -2,12 +2,4 @@ set noparent -bryanmawhinney@google.com -jstemmer@google.com -martinoh@google.com -millmore@google.com -niamhfw@google.com -piee@google.com -philippov@google.com -rthakohov@google.com -sarpm@google.com +include platform/frameworks/base:/services/backup/BACKUP_OWNERS |