diff options
| author | Tobias Thierer <tobiast@google.com> | 2017-10-31 13:41:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-31 13:41:34 +0000 |
| commit | 4f59edb63fa1032968cbbfab545bad687cb45321 (patch) | |
| tree | b1153e8bda134a3f58293537ba94a71328c212a4 /core/java | |
| parent | 2f1cb548ba299b0bd69c62f5c159437bfb244266 (diff) | |
| parent | b519569eb30cbda364ddef39bd55cef8f8e202d2 (diff) | |
Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"
am: b519569eb3
Change-Id: Ib9099673a4b643b10f38a0c94ddea49949f796eb
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/OWNERS | 2 | ||||
| -rw-r--r-- | core/java/com/android/internal/net/OWNERS | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index 0f1e2597f39e..d1ce60e9ff08 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 7cb32ff793e7..e2064a8099ae 100644 --- a/core/java/com/android/internal/net/OWNERS +++ b/core/java/com/android/internal/net/OWNERS @@ -2,5 +2,5 @@ set noparent ek@google.com hugobenichi@google.com -jsharkey@google.com +jsharkey@android.com lorenzo@google.com |