summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@google.com>2021-02-08 19:43:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-08 19:43:24 +0000
commit0192f22a73048bfe6768ad0e817157a78857326d (patch)
tree26e27451600fbf60cca03a01381f4c518c937889 /core/java
parent0f7ec99e751b1006a2e24424d1b4c2f24b1709f5 (diff)
parent808b6d895698daa2d0729e2eb44a3cd80c01372a (diff)
Merge "Add OWNERS for CPU-related files" am: 1cf122b5a7 am: 808b6d8956
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580527 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifbe90565c3df31a79bafa5a958a4df1ac1192fb0
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/android/internal/os/CPU_OWNERS3
-rw-r--r--core/java/com/android/internal/os/OWNERS1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java/com/android/internal/os/CPU_OWNERS b/core/java/com/android/internal/os/CPU_OWNERS
new file mode 100644
index 000000000000..5d3473cc0c9e
--- /dev/null
+++ b/core/java/com/android/internal/os/CPU_OWNERS
@@ -0,0 +1,3 @@
+connoro@google.com
+dplotnikov@google.com
+rslawik@google.com # Android Telemetry
diff --git a/core/java/com/android/internal/os/OWNERS b/core/java/com/android/internal/os/OWNERS
index 1b07aa0cf0b7..0aa54f556b92 100644
--- a/core/java/com/android/internal/os/OWNERS
+++ b/core/java/com/android/internal/os/OWNERS
@@ -1,5 +1,6 @@
per-file *Power* = file:/services/core/java/com/android/server/power/OWNERS
per-file *Zygote* = file:/ZYGOTE_OWNERS
+per-file *Cpu* = file:CPU_OWNERS
# BatteryStats
per-file BatterySipper.java = file:/BATTERY_STATS_OWNERS