Merge Android 24Q2 Release (ab/11526283) to aosp-main-future

Bug: 337098550 Merged-In: I96574a79eba581db95d387f0d9c9fde2e004c41c Change-Id: Ib9f2c742f8aa72651ef9eca80a716dd94b9041ea
2024-05-23 14:12:07 -07:00
parent 418897702e a6f283382a
commit f0e00b8bf7
1413 changed files with 69959 additions and 31812 deletions
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -1,4 +1,5 @@
 package {
+    default_team: "trendy_team_android_settings_app",
    default_applicable_licenses: ["packages_apps_Settings_license"],
 }

@@ -57,7 +58,7 @@ aconfig_declarations {
    package: "com.android.settings.development",
    container: "system",
    srcs: [
-        "development/**/*.aconfig"
+        "development/**/*.aconfig",
    ],
 }