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

Commit acbb1b55 authored by Ram Peri's avatar Ram Peri Committed by Automerger Merge Worker
Browse files

Merge "Fix META-INF for settings library to match robolectric" into main am:... 

Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6 am: cc1d59b3 am: eb446ca1

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



Change-Id: I0b5d81f67979bcb0fc5377e620d8be96059151a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbb1f9d6 eb446ca1

tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker

+1 −1
Original line number Diff line number Diff line 
org.robolectric.android.internal.NoOpThreadChecker
 
org.robolectric.android.internal.RobolectricThreadChecker