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

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

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

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

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

parents e069b132 cde197ca

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

+1 −1

Original line number	Diff line number	Diff line
		# 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	Diff line number	Diff line
		include platform/packages/apps/Nfc:/OWNERS
		No newline at end of file
		include platform/packages/modules/Nfc:/OWNERS
		No newline at end of file

nfc-extras/OWNERS

+1 −1

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

omapi/OWNERS

+1 −1

Original line number	Diff line number	Diff line
		# 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	Diff line number	Diff line
		# Bug component: 456592
		include platform/packages/apps/Nfc:/OWNERS
		include platform/packages/modules/Nfc:/OWNERS