Temporarily replace "android.com" accounts.

We're temporarily blocked on internal Gerrit tooling to support
relaxed OWNERS validation, so this change temporarily replaces all
"android.com" accounts with "google.com" equivalents.

Bug: 174932174,175111824
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I114f2a40cee1b65e21250da7372e11c18cd73e25

20 files changed, 24 insertions, 24 deletions

diff --git a/apex/jobscheduler/OWNERS b/apex/jobscheduler/OWNERS
index d004eed2a0db..0fe6cdffa5f6 100644
--- a/apex/jobscheduler/OWNERS
+++ b/apex/jobscheduler/OWNERS
@@ -1,6 +1,6 @@
 yamasani@google.com
 omakoto@google.com
-ctate@android.com
+ctate@google.com
 ctate@google.com
 kwekua@google.com
 suprabh@google.com
\ No newline at end of file
diff --git a/core/java/android/database/OWNERS b/core/java/android/database/OWNERS
index 7e19942ba332..1734cfcad360 100644
--- a/core/java/android/database/OWNERS
+++ b/core/java/android/database/OWNERS
@@ -1,3 +1,3 @@
 omakoto@google.com
-jsharkey@android.com
+jsharkey@google.com
 yamasani@google.com
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS
index 5e2a71876103..2f8f685af40b 100644
--- a/core/java/android/net/OWNERS
+++ b/core/java/android/net/OWNERS
@@ -2,7 +2,7 @@ set noparent
 
 codewiz@google.com
 jchalard@google.com
-jsharkey@android.com
+jsharkey@google.com
 junyulai@google.com
 lorenzo@google.com
 reminv@google.com
diff --git a/core/java/android/service/dreams/OWNERS b/core/java/android/service/dreams/OWNERS
index 708ab4c4ba79..951a1538f3a0 100644
--- a/core/java/android/service/dreams/OWNERS
+++ b/core/java/android/service/dreams/OWNERS
@@ -1,4 +1,4 @@
-dsandler@android.com
+dsandler@google.com
 michaelwr@google.com
 roosa@google.com
 galinap@google.com
diff --git a/core/java/android/service/notification/OWNERS b/core/java/android/service/notification/OWNERS
index 2e94be5bf329..fb981fadf43f 100644
--- a/core/java/android/service/notification/OWNERS
+++ b/core/java/android/service/notification/OWNERS
@@ -1,4 +1,4 @@
 juliacr@google.com
 beverlyt@google.com
-dsandler@android.com
+dsandler@google.com
 pixel@google.com
\ No newline at end of file
diff --git a/core/java/com/android/internal/net/OWNERS b/core/java/com/android/internal/net/OWNERS
index 050cb5c2b44e..fec56c3cc506 100644
--- a/core/java/com/android/internal/net/OWNERS
+++ b/core/java/com/android/internal/net/OWNERS
@@ -3,7 +3,7 @@ set noparent
 codewiz@google.com
 ek@google.com
 jchalard@google.com
-jsharkey@android.com
+jsharkey@google.com
 lorenzo@google.com
 reminv@google.com
 satk@google.com
diff --git a/data/etc/OWNERS b/data/etc/OWNERS
index 70d467829269..0e18c4813348 100644
--- a/data/etc/OWNERS
+++ b/data/etc/OWNERS
@@ -1 +1 @@
-per-file privapp-permissions-platform.xml = hackbod@android.com, jsharkey@android.com, svetoslavganov@google.com, toddke@google.com, yamasani@google.com, cbrubaker@google.com, jeffv@google.com, moltmann@google.com, lorenzo@google.com
+per-file privapp-permissions-platform.xml = hackbod@google.com, jsharkey@google.com, svetoslavganov@google.com, toddke@google.com, yamasani@google.com, cbrubaker@google.com, jeffv@google.com, moltmann@google.com, lorenzo@google.com
diff --git a/media/OWNERS b/media/OWNERS
index e74149019b11..b2875e7f067c 100644
--- a/media/OWNERS
+++ b/media/OWNERS
@@ -10,7 +10,7 @@ insun@google.com
 jaewan@google.com
 jinpark@google.com
 jmtrivi@google.com
-jsharkey@android.com
+jsharkey@google.com
 klhyun@google.com
 lajos@google.com
 marcone@google.com
diff --git a/media/java/android/mtp/OWNERS b/media/java/android/mtp/OWNERS
index 1928ba811e7e..e27d06f4825a 100644
--- a/media/java/android/mtp/OWNERS
+++ b/media/java/android/mtp/OWNERS
@@ -1,7 +1,7 @@
 set noparent
 
 marcone@google.com
-jsharkey@android.com
+jsharkey@google.com
 jameswei@google.com
 rmojumder@google.com
 
diff --git a/media/jni/OWNERS b/media/jni/OWNERS
index f1b0237d9008..e6e4f86505cf 100644
--- a/media/jni/OWNERS
+++ b/media/jni/OWNERS
@@ -1,5 +1,5 @@
 # extra for MTP related files
-per-file android_mtp_*.cpp=marcone@google.com,jsharkey@android.com,jameswei@google.com,rmojumder@google.com
+per-file android_mtp_*.cpp=marcone@google.com,jsharkey@google.com,jameswei@google.com,rmojumder@google.com
 
 # extra for TV related files
 per-file android_media_tv_*=nchalko@google.com,quxiangfang@google.com
diff --git a/media/tests/MtpTests/OWNERS b/media/tests/MtpTests/OWNERS
index 1928ba811e7e..e27d06f4825a 100644
--- a/media/tests/MtpTests/OWNERS
+++ b/media/tests/MtpTests/OWNERS
@@ -1,7 +1,7 @@
 set noparent
 
 marcone@google.com
-jsharkey@android.com
+jsharkey@google.com
 jameswei@google.com
 rmojumder@google.com
 
diff --git a/packages/SettingsLib/OWNERS b/packages/SettingsLib/OWNERS
index 8eafbdfdf6bc..30c10d3ef3b8 100644
--- a/packages/SettingsLib/OWNERS
+++ b/packages/SettingsLib/OWNERS
@@ -1,5 +1,5 @@
 # People who can approve changes for submission
-dsandler@android.com
+dsandler@google.com
 edgarwang@google.com
 emilychuang@google.com
 evanlaird@google.com
diff --git a/packages/Shell/OWNERS b/packages/Shell/OWNERS
index 6ba1fcb058b1..2d7a3e68f86a 100644
--- a/packages/Shell/OWNERS
+++ b/packages/Shell/OWNERS
@@ -1,6 +1,6 @@
 set noparent
 
-jsharkey@android.com
+jsharkey@google.com
 felipeal@google.com
 nandana@google.com
 svetoslavganov@google.com
diff --git a/packages/SystemUI/OWNERS b/packages/SystemUI/OWNERS
index f884270eaba8..3bda7106defa 100644
--- a/packages/SystemUI/OWNERS
+++ b/packages/SystemUI/OWNERS
@@ -1,6 +1,6 @@
 set noparent
 
-dsandler@android.com
+dsandler@google.com
 
 aaliomer@google.com
 adamcohen@google.com
diff --git a/proto/src/metrics_constants/OWNERS b/proto/src/metrics_constants/OWNERS
index 7009282b66e1..ab4d808f5ff0 100644
--- a/proto/src/metrics_constants/OWNERS
+++ b/proto/src/metrics_constants/OWNERS
@@ -1,4 +1,4 @@
-cwren@android.com
+cwren@google.com
 yanglu@google.com
 yaochen@google.com
 yro@google.com
diff --git a/services/core/java/com/android/server/dreams/OWNERS b/services/core/java/com/android/server/dreams/OWNERS
index 426f002ad236..3c9bbf8797ea 100644
--- a/services/core/java/com/android/server/dreams/OWNERS
+++ b/services/core/java/com/android/server/dreams/OWNERS
@@ -1,3 +1,3 @@
-dsandler@android.com
+dsandler@google.com
 michaelwr@google.com
 roosa@google.com
diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS
index 28ae6a417bd3..d5c7618199fe 100644
--- a/services/core/java/com/android/server/net/OWNERS
+++ b/services/core/java/com/android/server/net/OWNERS
@@ -2,7 +2,7 @@ set noparent
 
 codewiz@google.com
 jchalard@google.com
-jsharkey@android.com
+jsharkey@google.com
 junyulai@google.com
 lorenzo@google.com
 reminv@google.com
diff --git a/services/core/java/com/android/server/notification/OWNERS b/services/core/java/com/android/server/notification/OWNERS
index 5a19656b36a6..4dcb7995d8ae 100644
--- a/services/core/java/com/android/server/notification/OWNERS
+++ b/services/core/java/com/android/server/notification/OWNERS
@@ -1,4 +1,4 @@
-dsandler@android.com
+dsandler@google.com
 juliacr@google.com
 beverlyt@google.com
 pixel@google.com
diff --git a/services/core/java/com/android/server/pm/OWNERS b/services/core/java/com/android/server/pm/OWNERS
index cca2b8394c63..147fec635197 100644
--- a/services/core/java/com/android/server/pm/OWNERS
+++ b/services/core/java/com/android/server/pm/OWNERS
@@ -1,12 +1,12 @@
-hackbod@android.com
 hackbod@google.com
-jsharkey@android.com
+hackbod@google.com
+jsharkey@google.com
 jsharkey@google.com
 narayan@google.com
 patb@google.com
-svetoslavganov@android.com
 svetoslavganov@google.com
-toddke@android.com
+svetoslavganov@google.com
+toddke@google.com
 toddke@google.com
 
 # apex support
diff --git a/services/core/java/com/android/server/pm/permission/OWNERS b/services/core/java/com/android/server/pm/permission/OWNERS
index 0e88862e01b1..6e678305b860 100644
--- a/services/core/java/com/android/server/pm/permission/OWNERS
+++ b/services/core/java/com/android/server/pm/permission/OWNERS
@@ -1,7 +1,7 @@
 moltmann@google.com
 zhanghai@google.com
-per-file DefaultPermissionGrantPolicy.java = hackbod@android.com
-per-file DefaultPermissionGrantPolicy.java = jsharkey@android.com
+per-file DefaultPermissionGrantPolicy.java = hackbod@google.com
+per-file DefaultPermissionGrantPolicy.java = jsharkey@google.com
 per-file DefaultPermissionGrantPolicy.java = svetoslavganov@google.com
 per-file DefaultPermissionGrantPolicy.java = toddke@google.com
 per-file DefaultPermissionGrantPolicy.java = yamasani@google.com