[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours

Browse Source

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

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

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

...

This commit is contained in:

Sorin Basca

2022-07-20 06:26:16 +00:00

committed by Automerger Merge Worker

parent b3fb29a4e3 5781b7ab3a

commit 0085dcc80c

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