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

Commit 163599bd authored Aug 17, 2023 by Eric Biggers Committed by Automerger Merge Worker Aug 17, 2023

Merge "Update owners for keystore related files" into main am: 488eed6f am: b7f303e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2704211

Change-Id: I679690c781d291107aa73714c39485b055c29bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 4afb040f b7f303e8

core/java/android/security/OWNERS

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,5 +7,4 @@ per-file NetworkSecurityPolicy.java = cbrubaker@google.com
	per-file NetworkSecurityPolicy.java = klyubin@google.com		per-file NetworkSecurityPolicy.java = klyubin@google.com
	per-file FrameworkNetworkSecurityPolicy.java = cbrubaker@google.com		per-file FrameworkNetworkSecurityPolicy.java = cbrubaker@google.com
	per-file FrameworkNetworkSecurityPolicy.java = klyubin@google.com		per-file FrameworkNetworkSecurityPolicy.java = klyubin@google.com
	per-file Confirmation*.java = jdanis@google.com		per-file Confirmation*.java = file:/keystore/OWNERS
	per-file Confirmation*.java = swillden@google.com

core/java/android/security/keystore/OWNERS

+1 −5

Original line number	Original line	Diff line number	Diff line
	# Bug component: 189335		include /keystore/OWNERS

	swillden@google.com
	jdanis@google.com
	jbires@google.com

core/java/android/security/keystore/recovery/OWNERS

deleted100644 → 0

+0 −5

Original line number	Original line	Diff line number	Diff line
	# Bug component: 189335

	swillden@google.com
	jdanis@google.com
	jbires@google.com

core/tests/coretests/src/android/security/keystore/OWNERS

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			include /keystore/OWNERS

keystore/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
			# Bug component: 189335
	eranm@google.com		eranm@google.com
	jbires@google.com		jbires@google.com
	jdanis@google.com
	swillden@google.com		swillden@google.com