commit | 4f59edb63fa1032968cbbfab545bad687cb45321 | [log] [tgz] |
---|---|---|
author | Tobias Thierer <tobiast@google.com> | Tue Oct 31 13:41:34 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 31 13:41:34 2017 +0000 |
tree | b1153e8bda134a3f58293537ba94a71328c212a4 | |
parent | 2f1cb548ba299b0bd69c62f5c159437bfb244266 [diff] | |
parent | b519569eb30cbda364ddef39bd55cef8f8e202d2 [diff] |
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b519569eb3 Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb
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