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

Commit cde197ca authored Feb 11, 2025 by Treehugger Robot Committed by Automerger Merge Worker Feb 11, 2025

Merge "Fix nfc owners location" into main am: a4df8f74

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

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

parents 66155284 a4df8f74

cmds/svc/src/com/android/commands/svc/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Bug component: 48448		# Bug component: 48448
	per-file NfcCommand.java = file:platform/packages/apps/Nfc:/OWNERS		per-file NfcCommand.java = file:platform/packages/modules/Nfc:/OWNERS

core/proto/android/nfc/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	include platform/packages/apps/Nfc:/OWNERS		include platform/packages/modules/Nfc:/OWNERS
	No newline at end of file		No newline at end of file

nfc-extras/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Bug component: 48448		# Bug component: 48448
	include platform/packages/apps/Nfc:/OWNERS		include platform/packages/modules/Nfc:/OWNERS

omapi/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Bug component: 456592		# Bug component: 456592
	include platform/packages/apps/Nfc:/OWNERS		include platform/packages/modules/Nfc:/OWNERS

omapi/java/android/se/OWNERS

+1 −1

Original line number	Original line	Diff line number	Diff line
	# Bug component: 456592		# Bug component: 456592
	include platform/packages/apps/Nfc:/OWNERS		include platform/packages/modules/Nfc:/OWNERS