Merge "Clean up ownership in frameworks/base/" into sc-dev

apex/media/OWNERS

@@ -1,10 +1,10 @@
-andrewlewis@google.com
+# Bug component: 1344
-aquilescanta@google.com
-chz@google.com
 hdmoon@google.com
 hkuang@google.com
 jinpark@google.com
 klhyun@google.com
 lnilsson@google.com
-marcone@google.com
 sungsoo@google.com
+
+# go/android-fwk-media-solutions for info on areas of ownership.
+include platform/frameworks/av:/media/janitors/media_solutions_OWNERS

media/OWNERS

@@ -1,8 +1,7 @@
-chz@google.com
+# Bug component: 1344
 elaurent@google.com
 essick@google.com
 etalvala@google.com
-gkasten@google.com
 hdmoon@google.com
 hkuang@google.com
 hunga@google.com
@@ -13,16 +12,13 @@ jmtrivi@google.com
 jsharkey@android.com
 klhyun@google.com
 lajos@google.com
-marcone@google.com
 nchalko@google.com
 philburk@google.com
 quxiangfang@google.com
 wonsik@google.com
 
-# LON
+# go/android-fwk-media-solutions for info on areas of ownership.
-andrewlewis@google.com
+include platform/frameworks/av:/media/janitors/media_solutions_OWNERS
-aquilescanta@google.com
-olly@google.com
 
 # SEO
 sungsoo@google.com

media/java/android/media/OWNERS

@@ -1,9 +1,9 @@
 # Bug component: 1344
-
 fgoldfain@google.com
 elaurent@google.com
 lajos@google.com
-olly@google.com
-andrewlewis@google.com
 sungsoo@google.com
 jmtrivi@google.com
+
+# go/android-fwk-media-solutions for info on areas of ownership.
+include platform/frameworks/av:/media/janitors/media_solutions_OWNERS