summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hawkwood Glazier <jglazier@google.com> 2024-08-27 12:08:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-08-27 12:08:33 +0000
commit992ffb63a07d4032ec1fb6e011342175dfb41e7c (patch)
tree3bc16e642fc11213362f3d9028eb6ea68a415803
parent30c41f95391fc1710cacf94563596c18d2a4a6ee (diff)
parent592ae9fe11d212197f8af89323c02197cc777176 (diff)
Merge "Use keyguard OWNERS for clocks/customization" into main am: b103b347e2 am: 592ae9fe11
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3241540 Change-Id: Id5fbd26ae157c07f196fb5888a5ee664c34f94ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/customization/src/com/android/systemui/shared/clocks/OWNERS1
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/OWNERS1
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/OWNERS b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/OWNERS
new file mode 100644
index 000000000000..f6f98e934dde
--- /dev/null
+++ b/packages/SystemUI/customization/src/com/android/systemui/shared/clocks/OWNERS
@@ -0,0 +1 @@
+include /packages/SystemUI/src/com/android/systemui/keyguard/OWNERS
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/OWNERS b/packages/SystemUI/src/com/android/systemui/keyguard/OWNERS
index 443e98762c47..208a17c0a220 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/OWNERS
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/OWNERS
@@ -9,3 +9,4 @@ chandruis@google.com
jglazier@google.com
mpietal@google.com
tsuji@google.com
+yuandizhou@google.com