[automerger skipped] [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c am: 91aec69fdc -s ours

Browse Source

am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 c1c3a84fdc is already in history

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

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

...

This commit is contained in:

TreeHugger Robot

2022-07-19 19:48:58 +00:00

committed by Automerger Merge Worker

parent f7f800793c 91aec69fdc

commit d257564701

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available