summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2021-10-14 13:04:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-14 13:04:37 +0000
commite517ba7e7f85acbc5134ffbf07529cd71f21f869 (patch)
treeecdab5673d105e1adb746332cba9765d4ce4b597 /core/java
parentacedbfbdca5ec6ba81817fc96024b7dd0076bbb4 (diff)
parentdc313c42be966d88174842e933582d3b20907eb8 (diff)
Merge "Attempt 2 for adding OWNERS for SNTP code" am: c3c74384e2 am: dc313c42be
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1857735 Change-Id: Ibb6cd1d2f935525a52ad978685727249a9764a2e
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/net/OWNERS4
-rw-r--r--core/java/android/net/sntp/OWNERS1
2 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS
index 24a06dfc8b97..f55bcd31feb7 100644
--- a/core/java/android/net/OWNERS
+++ b/core/java/android/net/OWNERS
@@ -2,5 +2,5 @@ set noparent
include platform/frameworks/base:/services/core/java/com/android/server/net/OWNERS
-per-file SSL*, Uri*, Url* = prb@google.com, dauletz@google.com, narayan@google.com, ngeoffray@google.com
-per-file SntpClient*, sntp/* = file:/services/core/java/com/android/server/timedetector/OWNERS
+per-file SSL*,Uri*,Url* = prb@google.com,oth@google.com,narayan@google.com,ngeoffray@google.com
+per-file SntpClient* = file:/services/core/java/com/android/server/timedetector/OWNERS
diff --git a/core/java/android/net/sntp/OWNERS b/core/java/android/net/sntp/OWNERS
new file mode 100644
index 000000000000..9a3e264a067f
--- /dev/null
+++ b/core/java/android/net/sntp/OWNERS
@@ -0,0 +1 @@
+include /services/core/java/com/android/server/timedetector/OWNERS