diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2021-02-08 17:19:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-08 17:19:38 +0000 |
| commit | 80382deadc0bdc9d6df501c09d39fe3d6dda2496 (patch) | |
| tree | 0e330238fa99b0923fea8689ccb8235e9a454ace /core/java | |
| parent | f6ca5649ec4b5abc361ab293cad48a55cffb4948 (diff) | |
| parent | d25ad6a11669057f2c37d6c97599f330f7dffd81 (diff) | |
Merge "Add resource owners" am: d25ad6a116
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580196
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iccb44fae12908c3539253399e76aa00993f62777
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/OWNERS | 2 | ||||
| -rw-r--r-- | core/java/android/app/RESOURCES_OWNERS | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/OWNERS b/core/java/android/app/OWNERS index e6aa7a77357c..1ff64dbe6d2e 100644 --- a/core/java/android/app/OWNERS +++ b/core/java/android/app/OWNERS @@ -59,7 +59,7 @@ per-file IInstantAppResolver.aidl = file:/services/core/java/com/android/server/ per-file InstantAppResolveInfo.aidl = file:/services/core/java/com/android/server/pm/OWNERS # ResourcesManager -per-file ResourcesManager.java = rtmitchell@google.com, toddke@google.com +per-file ResourcesManager.java = file:RESOURCES_OWNERS # VoiceInteraction per-file *VoiceInteract* = file:/core/java/android/service/voice/OWNERS diff --git a/core/java/android/app/RESOURCES_OWNERS b/core/java/android/app/RESOURCES_OWNERS new file mode 100644 index 000000000000..21c39a8828ad --- /dev/null +++ b/core/java/android/app/RESOURCES_OWNERS @@ -0,0 +1,2 @@ +rtmitchell@google.com +toddke@google.com |