summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-03-26 00:55:15 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-26 00:55:15 +0000
commit1b7a6f59105966ba828329dc1d75821071779d67 (patch)
tree28ac8e94da6b99d0b736bf1ca52e5fae8665b0f7
parent3de3b3f97c42e8d8f76f8adbed9a641c1f4b9259 (diff)
parent3ca6ec99b53b2d9881ce5ad78cf62d2e4e0b5180 (diff)
downloadbase-1b7a6f59105966ba828329dc1d75821071779d67.tar.gz
Merge changes from topic "media-camera-owners" into main
* changes: Add jchowdhary@ to media owners as well Add camera framework owners to core as well.
-rw-r--r--core/jni/OWNERS3
-rw-r--r--media/OWNERS1
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/OWNERS b/core/jni/OWNERS
index 3aca751edb0d..d687ef375bc3 100644
--- a/core/jni/OWNERS
+++ b/core/jni/OWNERS
@@ -1,6 +1,5 @@
# Camera
-per-file *Camera*,*camera* = cychen@google.com, epeev@google.com, etalvala@google.com
-per-file *Camera*,*camera* = shuzhenwang@google.com, yinchiayeh@google.com, zhijunhe@google.com
+per-file *Camera*,*camera* = file:platform/frameworks/av:/camera/OWNERS
# Connectivity
per-file android_net_* = codewiz@google.com, jchalard@google.com, lorenzo@google.com, reminv@google.com, satk@google.com
diff --git a/media/OWNERS b/media/OWNERS
index 2e9276d73392..1e5a458a5bff 100644
--- a/media/OWNERS
+++ b/media/OWNERS
@@ -4,6 +4,7 @@ elaurent@google.com
essick@google.com
etalvala@google.com
hunga@google.com
+jchowdhary@google.com
jmtrivi@google.com
jsharkey@android.com
lajos@google.com