actually merge conflicts

Author: sofisl

discovery/androidmanagement-v1.json

@@ -1202,11 +1202,7 @@
       }
     }
   },
-<<<<<<< HEAD
-  "revision": "20250428",
-=======
   "revision": "20250501",
->>>>>>> 68f904aab4e6a136bf8a0bcd4ef5b2ed2a6cdcb4
   "rootUrl": "https://androidmanagement.googleapis.com/",
   "schemas": {
     "AdbShellCommandEvent": {
@@ -3405,8 +3401,6 @@
       },
       "type": "object"
     },
-<<<<<<< HEAD
-=======
     "EuiccChipInfo": {
       "description": "Information related to the eUICC chip.",
       "id": "EuiccChipInfo",
@@ -3419,7 +3413,6 @@
       },
       "type": "object"
     },
->>>>>>> 68f904aab4e6a136bf8a0bcd4ef5b2ed2a6cdcb4
     "ExtensionConfig": {
       "description": "Configuration to enable an app as an extension app, with the capability of interacting with Android Device Policy offline. For Android versions 11 and above, extension apps are exempt from battery restrictions so will not be placed into the restricted App Standby Bucket (https://developer.android.com/topic/performance/appstandby#restricted-bucket). Extensions apps are also protected against users clearing their data or force-closing the application, although admins can continue to use the clear app data command on extension apps if needed for Android 11 and above.",
       "id": "ExtensionConfig",