summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-12-23 21:49:43 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-23 21:49:43 +0000
commitbee02f2ab336f56e11b0c373755661a941b74bc5 (patch)
tree94b380abb2e75687c73d360be3ec4b47e4a413ca
parent9c1f285e86e046ba231d81430f9cddb0bb589fe7 (diff)
parent03b5b82cdf55f0eb3f5f5aee2c8e5dd7fe9e1227 (diff)
Merge "Add SettingsProvider team as OWNERS of android.provider.Settings" am: d83aa0243b am: f3b68805b1 am: 03b5b82cdf
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1535814 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I84e7050524fc10d73056cbda897e9672856aeb1c
-rw-r--r--core/java/android/provider/OWNERS1
-rw-r--r--packages/SettingsProvider/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/provider/OWNERS b/core/java/android/provider/OWNERS
index b02102b5e9a7..cb1509af66ac 100644
--- a/core/java/android/provider/OWNERS
+++ b/core/java/android/provider/OWNERS
@@ -10,6 +10,7 @@ per-file *Calendar* = file:platform/packages/providers/CalendarProvider:/OWNERS
per-file *Downloads* = file:platform/packages/providers/DownloadProvider:/OWNERS
per-file *DeviceConfig* = file:/packages/SettingsProvider/OWNERS
+per-file *Settings* = file:/packages/SettingsProvider/OWNERS
per-file *Documents* = file:/core/java/android/os/storage/OWNERS
per-file *Documents* = file:platform/packages/apps/DocumentsUI:/OWNERS
diff --git a/packages/SettingsProvider/OWNERS b/packages/SettingsProvider/OWNERS
index b2ac4f43e845..cf9799c6a026 100644
--- a/packages/SettingsProvider/OWNERS
+++ b/packages/SettingsProvider/OWNERS
@@ -1,3 +1,4 @@
+hackbod@android.com
hackbod@google.com
narayan@google.com
svetoslavganov@google.com