[automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 80bc3ad60a -s ours am: a5edae8e19 -s ours

Browse Source

am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e40 is already in history. Merged-In was found from reverted change.

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

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

...

This commit is contained in:

Josep del Río

2023-01-12 14:54:37 +00:00

committed by Automerger Merge Worker

parent 5662284ffa a5edae8e19

commit b5229a6ae6

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