[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 59b496c31d -s ours am: 0e6426add4 -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: I45549c4b79780ac6bbb8f485294e9ac969c3c8c4
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:28 +00:00

committed by Automerger Merge Worker

parent 1c3e5c3fe7 0e6426add4

commit f520737eef

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