summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2021-01-11 19:58:24 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2021-01-11 19:58:24 +0000
commita04840d231cb66c093073e1f9a32f74b84ed1ecb (patch)
tree83b0cf70d6d3b8c2b01c6e34bb3ca569539f766d
parent59df97be63448e7c4cd540704c03eeddc075cac0 (diff)
parent6c1f227875cf72044e20dd0db0735eb8c959b637 (diff)
Merge "Include app hibernation OWNERS file in others"
-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