Commit a13c7092 authored Dec 13, 2024 by Xin Li

Fix a mismerge by removing duplicated flag for improved wallet role icon

This should have been skipped by automerger; however we missed it due to
an unrelated merge conflict and git merge have applied the change
because it did not cause a conflict itself.  The rest of aosp/3414381
was merged correctly.

Bug: 349942654
Merged-In: I5f91668aca93fcba963e046b7f26345f40a0c6f3
Change-Id: Ia8c7a741172be4a4da787c52dfa4d4f5dd9af4c1

parent 7b1f850c

core/java/android/permission/flags.aconfig

+0 −8

Original line number	Diff line number	Diff line
		@@ -275,11 +275,3 @@ flag {
		description: "This fixed read-only flag is used to enable new ranging permission for all ranging use cases."
		bug: "370977414"
		}

		flag {
		name: "wallet_role_icon_property_enabled"
		is_exported: true
		namespace: "wallet_integration"
		description: "This flag is used to enabled the Wallet Role s icon fetching from manifest property"
		bug: "349942654"
		}