TreeHugger Robot 91aec69fdc [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c ...

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

Change-Id: I52547d10f0579fddb21091b641925910db17ef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b

2022-07-18 22:39:07 +00:00

..

anomaly-tester

…

componenttests

…

legacy_unit

Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f am: d5ab7dc729

2022-05-24 11:20:54 +00:00

perftests

…

robotests

[conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c

2022-07-18 22:39:07 +00:00

uitests

…

unit

Distinguish multiple PendingIntents via requestCode am: 25686219d3

2022-07-18 19:19:15 +00:00