| commit | cc1d59b3b9f9e18b9aab2c6b9a9e0802424921cc | [log] [tgz] |
|---|---|---|
| author | Ram Peri <ramperi@google.com> | Wed Aug 30 15:14:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 30 15:14:08 2023 +0000 |
| tree | 012ec55064e393c961c02f99d71ef3243e73714f | |
| parent | 6d9e295c3a2698c6592176c55c0feed1b1e72ac1 [diff] | |
| parent | cd34a5f6d68f91bb30fbaba85dd73f0ccab03f0b [diff] |
Merge "Fix META-INF for settings library to match robolectric" into main am: cd34a5f6d6 Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2731384 Change-Id: Ie747b6771b59f48fbb82c416580e823a117d984b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker index 55104ea..341f4d9 100644 --- a/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker +++ b/tests/robotests/resources/META-INF/services/androidx.test.internal.platform.ThreadChecker
@@ -1 +1 @@ -org.robolectric.android.internal.NoOpThreadChecker +org.robolectric.android.internal.RobolectricThreadChecker