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

Commit d48cf90f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I82cecd20,I2b4e41a4 into rvc-dev am: cbbc9c5c am: 0b80c491 am: 3c5e28f1 

Change-Id: I076ad1cded3eeba4963b988f3874057c0fc5af9d
parents d2e2d744 3c5e28f1

apex/media/framework/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ java_library { 
        "com.android.media",

        "test_com.android.media",

    ],

    min_sdk_version: "29",

}



filegroup {

packages/CtsShim/build/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ android_app { 
        "com.android.apex.cts.shim.v2_unsigned_payload",

        "com.android.apex.cts.shim.v3",

    ],

    min_sdk_version: "24",

}



//##########################################################
@@ -152,4 +153,5 @@ android_app { 
        "com.android.apex.cts.shim.v2_unsigned_payload",

        "com.android.apex.cts.shim.v3",

    ],

    min_sdk_version: "24",

}