summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Aaron Huang <huangaaron@google.com> 2021-04-22 06:45:19 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-04-22 06:45:19 +0000
commiteebc8afb52eb8b6638f6e63357d5dead642febd5 (patch)
treebf6e4dbdd88bedb3ffb226b0414bfdc8afab70de
parent35bd9bdb61a2514317870f3acc0df8c9bc4342fb (diff)
parent79bb916144716ea5bdb7cc26aad2f40552d70624 (diff)
Merge "Add owners for VpnManagerService" am: 2984d87873 am: 79bb916144
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684465 Change-Id: I65218978d2028e2a918f4a16580ef073492dbb46
-rw-r--r--services/core/java/com/android/server/OWNERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/OWNERS b/services/core/java/com/android/server/OWNERS
index 9821cdc64f69..55e1b46a51a9 100644
--- a/services/core/java/com/android/server/OWNERS
+++ b/services/core/java/com/android/server/OWNERS
@@ -1,5 +1,5 @@
# Connectivity / Networking
-per-file ConnectivityService.java,ConnectivityServiceInitializer.java,NetworkManagementService.java,NsdService.java = file:/services/core/java/com/android/server/net/OWNERS
+per-file ConnectivityService.java,ConnectivityServiceInitializer.java,NetworkManagementService.java,NsdService.java,VpnManagerService.java = file:/services/core/java/com/android/server/net/OWNERS
# Vibrator / Threads
per-file VibratorService.java, DisplayThread.java = michaelwr@google.com