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

Commit 49d8c851 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Launcher3QuickStepGo should have one Default Activity" into main am:... 

Merge "Launcher3QuickStepGo should have one Default Activity" into main am: 11b22099 am: 776d87a4

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2652760



Change-Id: I3bc12af4ea49820c42e7ec03a8c4211dd07cf9f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7aea246 776d87a4

Android.bp

+1 −1
Original line number Original line Diff line number Diff line
@@ -273,7 +273,7 @@ android_library { 
        "androidx.room_room-runtime",

        "androidx.room_room-runtime",

    ],

    ],

    plugins: ["androidx.room_room-compiler-plugin"],

    plugins: ["androidx.room_room-compiler-plugin"],

    manifest: "quickstep/AndroidManifest-launcher.xml",

    manifest: "quickstep/AndroidManifest.xml",

    additional_manifests: [

    additional_manifests: [

        "go/AndroidManifest.xml",

        "go/AndroidManifest.xml",

        "AndroidManifest-common.xml",

        "AndroidManifest-common.xml",