summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-11 21:19:49 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-11 21:19:49 +0000
commit732505b2c5ff9c352553b39abbb9c46fa3dadedc (patch)
treefd13f47d2d6be755213eef1954793acdf0a9b2d8
parentda3ee63d75e1512b555c88f01d6297b91d4d9a10 (diff)
parent23172d0eeffe98af03cb826335dd6915e72affa2 (diff)
Merge "Include app hibernation OWNERS file in others" am: a04840d231 am: 23172d0eef
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1543878 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc0b355e7983e49802f6a75b880ce915aa216226
-rw-r--r--services/core/java/com/android/server/apphibernation/OWNERS4
-rw-r--r--services/tests/servicestests/src/com/android/server/apphibernation/OWNERS1
2 files changed, 2 insertions, 3 deletions
diff --git a/services/core/java/com/android/server/apphibernation/OWNERS b/services/core/java/com/android/server/apphibernation/OWNERS
index 4804fa3eb915..c2e27e084c8c 100644
--- a/services/core/java/com/android/server/apphibernation/OWNERS
+++ b/services/core/java/com/android/server/apphibernation/OWNERS
@@ -1,3 +1 @@
-# TODO: Include /core/java/android/apphibernation/OWNERS. See b/177005153
-kevhan@google.com
-rajekumar@google.com
+include /core/java/android/apphibernation/OWNERS
diff --git a/services/tests/servicestests/src/com/android/server/apphibernation/OWNERS b/services/tests/servicestests/src/com/android/server/apphibernation/OWNERS
new file mode 100644
index 000000000000..c2e27e084c8c
--- /dev/null
+++ b/services/tests/servicestests/src/com/android/server/apphibernation/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/apphibernation/OWNERS