commit 2daef7f6cf3ab06149a0fd6aa63b06554c9c4e60
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Dec 13 21:02:04 2024 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 13 21:02:04 2024 -0800
tree 2511ff8dee4c5ef27b206805a57d72d0dfe7dc22
parent 7b1f850c50427ff38c20c83721c2e7aa173e62c2
parent a13c7092db0993dc1e0bc2279503b0efce928324

Merge "Fix a mismerge by removing duplicated flag for improved wallet role icon" into main

core/java/android/permission/flags.aconfig

diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig
index 8ad3018..fdd491c 100644
--- a/core/java/android/permission/flags.aconfig
+++ b/core/java/android/permission/flags.aconfig
@@ -275,11 +275,3 @@
     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"
-}