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

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

Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156"... 

Merge changes from topic "cherrypicker-L70100000956505250:N87500001297085156" into tm-qpr-dev am: dbf61511

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20008784



Change-Id: I1564237ab1a61007ab042dd8b009b0dcf56981d5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 006c5131 dbf61511

media/TEST_MAPPING

+3 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "mediaroutertest"

    },

    {

      "name": "CtsCameraTestCases",

      "options" : [

media/tests/MediaRouter/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android_test { 
        "testng",

        "truth-prebuilt",

    ],



    test_suites: ["general-tests"],

    platform_apis: true,

    certificate: "platform",

}