[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours am: 0e6426add4 -s ours am: f520737eef -s ours am: 621686a614 -s ours am: 40b8530a85 -s ours

Browse Source

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152642

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

...

This commit is contained in:

Sorin Basca

2022-07-20 07:43:41 +00:00

committed by Automerger Merge Worker

parent b6079ee63e 40b8530a85

commit 5ed3cf9fc2

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