commit | b519569eb30cbda364ddef39bd55cef8f8e202d2 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Oct 31 13:26:23 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Oct 31 13:26:23 2017 +0000 |
tree | b1153e8bda134a3f58293537ba94a71328c212a4 | |
parent | 01c9c0e4ba3912907030a53123d6a37325cfb646 [diff] | |
parent | 66d1933ce0251a472313009bf684951e89ec3bfe [diff] |
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index 0f1e259..d1ce60e 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS
@@ -1,6 +1,6 @@ ek@google.com hugobenichi@google.com -jsharkey@google.com +jsharkey@android.com lorenzo@google.com satk@google.com silberst@google.com
diff --git a/core/java/com/android/internal/net/OWNERS b/core/java/com/android/internal/net/OWNERS index 7cb32ff..e2064a8 100644 --- a/core/java/com/android/internal/net/OWNERS +++ b/core/java/com/android/internal/net/OWNERS
@@ -2,5 +2,5 @@ ek@google.com hugobenichi@google.com -jsharkey@google.com +jsharkey@android.com lorenzo@google.com
diff --git a/services/core/java/com/android/server/net/OWNERS b/services/core/java/com/android/server/net/OWNERS index 061fd8d..6b77d83 100644 --- a/services/core/java/com/android/server/net/OWNERS +++ b/services/core/java/com/android/server/net/OWNERS
@@ -2,7 +2,7 @@ ek@google.com hugobenichi@google.com -jsharkey@google.com +jsharkey@android.com lorenzo@google.com satk@google.com silberst@google.com