summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Horvath <robhor@google.com> 2019-11-18 01:14:27 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-18 01:14:27 -0800
commit070374046c04fa11fcf2f92fa4010d39ea2188fd (patch)
tree34ec2872b66c267a191081de1cc405316e8bb971
parent8a3553fc223f8c4e103996b03621c2b7c5f379c2 (diff)
parent85e44e1976156e082104d4c36d5d6a9318583964 (diff)
Merge "Rename OWNER to OWNERS for media/tv" am: a4ff2b159f am: 16a5ce0026
am: 85e44e1976 Change-Id: I9de7cf1830720ce025e0e4aa73b2fa00f1fceffa
-rw-r--r--media/java/android/media/tv/OWNER5
-rw-r--r--media/java/android/media/tv/OWNERS3
2 files changed, 3 insertions, 5 deletions
diff --git a/media/java/android/media/tv/OWNER b/media/java/android/media/tv/OWNER
deleted file mode 100644
index 64c0bb53e894..000000000000
--- a/media/java/android/media/tv/OWNER
+++ /dev/null
@@ -1,5 +0,0 @@
-amyjojo@google.com
-nchalko@google.com
-shubang@google.com
-quxiangfang@google.com
-
diff --git a/media/java/android/media/tv/OWNERS b/media/java/android/media/tv/OWNERS
index 4a03b3c6852e..64c0bb53e894 100644
--- a/media/java/android/media/tv/OWNERS
+++ b/media/java/android/media/tv/OWNERS
@@ -1,2 +1,5 @@
+amyjojo@google.com
nchalko@google.com
+shubang@google.com
+quxiangfang@google.com