diff options
| author | 2023-09-17 00:57:42 +0000 | |
|---|---|---|
| committer | 2023-09-17 00:57:42 +0000 | |
| commit | 20e093b09c92cd5eff2c30b4c383d55ca66022c2 (patch) | |
| tree | 604825ffac8e2b53255f4231e94524eebbc812d6 | |
| parent | 46a297ad510e8b39baf8c3126d4986ce5295c5f9 (diff) | |
| parent | 52be79301d7fe0305c00660e8348e0694265a754 (diff) | |
Merge "Update the resources owners" into main am: 20da2afe2e am: 21552d0af9 am: 3ebe5ec63a am: 2da74c0cb6 am: 52be79301d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24773340
Change-Id: I3a0443b943c486d9ca8d2b828e173a49bb1bd08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/content/om/OWNERS | 3 | ||||
| -rw-r--r-- | core/java/android/content/res/OWNERS | 3 | ||||
| -rw-r--r-- | libs/androidfw/OWNERS | 1 | ||||
| -rw-r--r-- | tools/aapt2/OWNERS | 4 |
4 files changed, 4 insertions, 7 deletions
diff --git a/core/java/android/content/om/OWNERS b/core/java/android/content/om/OWNERS index 3669817e9844..72aed2d3fdaf 100644 --- a/core/java/android/content/om/OWNERS +++ b/core/java/android/content/om/OWNERS @@ -1,6 +1,5 @@ # Bug component: 568631 -toddke@android.com -toddke@google.com patb@google.com zyy@google.com +jakmcbane@google.com
\ No newline at end of file diff --git a/core/java/android/content/res/OWNERS b/core/java/android/content/res/OWNERS index a7bce122eb35..141d58d51353 100644 --- a/core/java/android/content/res/OWNERS +++ b/core/java/android/content/res/OWNERS @@ -1,8 +1,7 @@ # Bug component: 568761 -toddke@android.com -toddke@google.com patb@google.com zyy@google.com +branliu@google.com per-file FontScaleConverter*=fuego@google.com
\ No newline at end of file diff --git a/libs/androidfw/OWNERS b/libs/androidfw/OWNERS index 436f10737cb4..ef4cc46cb1c8 100644 --- a/libs/androidfw/OWNERS +++ b/libs/androidfw/OWNERS @@ -1,5 +1,4 @@ set noparent -toddke@google.com zyy@google.com patb@google.com diff --git a/tools/aapt2/OWNERS b/tools/aapt2/OWNERS index 4f655e54a7c2..55bab7d8d74f 100644 --- a/tools/aapt2/OWNERS +++ b/tools/aapt2/OWNERS @@ -1,4 +1,4 @@ set noparent -toddke@google.com zyy@google.com -patb@google.com
\ No newline at end of file +patb@google.com +markpun@google.com |