Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e74399de authored Oct 31, 2017 by Tobias Thierer Committed by android-build-merger Oct 31, 2017

Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com"...

Merge "OWNERS: Prefer Jeff Sharkey's @android.com account over @google.com" am: b519569e am: 4f59edb6
am: 60923f78

Change-Id: I52d63eac03e32f6d020809cae2cecb7cad0154c0

parents 0437f023 60923f78

core/java/android/net/OWNERS

+1 −1

Original line number	Diff line number	Diff line
		ek@google.com
		hugobenichi@google.com
		jsharkey@google.com
		jsharkey@android.com
		lorenzo@google.com
		satk@google.com
		silberst@google.com

core/java/com/android/internal/net/OWNERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,5 +2,5 @@ set noparent

		ek@google.com
		hugobenichi@google.com
		jsharkey@google.com
		jsharkey@android.com
		lorenzo@google.com

services/core/java/com/android/server/net/OWNERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@ set noparent

		ek@google.com
		hugobenichi@google.com
		jsharkey@google.com
		jsharkey@android.com
		lorenzo@google.com
		satk@google.com
		silberst@google.com