summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-27 20:46:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-27 20:46:23 +0000
commitd07b6794073068cc925290a74bf483a4dc137741 (patch)
tree83518bf08480793a7e5ceffaf5e82b6d6e5a1b0b
parent90d91e9759daa12c3b3f4f18de41a3a225dbc2af (diff)
parent4da1d0efcb5262c3dbfc793d5e718b03c77ce62d (diff)
downloadbase-d07b6794073068cc925290a74bf483a4dc137741.tar.gz
Merge "Update the Resources owners" into main
-rw-r--r--core/java/android/app/OWNERS1
-rw-r--r--core/java/android/app/RESOURCES_OWNERS6
2 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS
index ff1ea4f214f6..712f3e534a1c 100644
--- a/core/java/android/app/OWNERS
+++ b/core/java/android/app/OWNERS
@@ -42,6 +42,7 @@ per-file BackgroundStartPrivileges.java = file:/BAL_OWNERS
# ActivityThread
per-file ActivityThread.java = file:/services/core/java/com/android/server/am/OWNERS
per-file ActivityThread.java = file:/services/core/java/com/android/server/wm/OWNERS
+per-file ActivityThread.java = file:RESOURCES_OWNERS
# Alarm
per-file *Alarm* = file:/apex/jobscheduler/OWNERS
diff --git a/core/java/android/app/RESOURCES_OWNERS b/core/java/android/app/RESOURCES_OWNERS
index 558280396348..fe37c0ccf5de 100644
--- a/core/java/android/app/RESOURCES_OWNERS
+++ b/core/java/android/app/RESOURCES_OWNERS
@@ -1,3 +1,5 @@
-rtmitchell@google.com
-toddke@google.com
+zyy@google.com
+jakmcbane@google.com
+branliu@google.com
+markpun@google.com
patb@google.com