summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-09-27 23:54:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-27 23:54:17 +0000
commitaf77450f29ed9073eff9b0211a8307432e92540c (patch)
treec93a23eb2c598542a637e003d09701bb2d98aa3c
parent867fe7aa72f4bd70cb2aacf319429c07184c94a0 (diff)
parente557a3b82310e4e310bd385011322a8f39f3ab7d (diff)
Merge "OWNERS: master -> main" into main am: 7da2ab970b am: e557a3b823
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765552 Change-Id: Icbfc4e2a2ede782f812c099d38f727e59e4a267d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/core/java/com/android/server/security/rkp/OWNERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/security/rkp/OWNERS b/services/core/java/com/android/server/security/rkp/OWNERS
index 348f94048311..ea6dc727c7b2 100644
--- a/services/core/java/com/android/server/security/rkp/OWNERS
+++ b/services/core/java/com/android/server/security/rkp/OWNERS
@@ -1 +1 @@
-file:platform/frameworks/base:master:/core/java/android/security/rkp/OWNERS
+file:platform/frameworks/base:main:/core/java/android/security/rkp/OWNERS