[automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 98bfab5f23 -s ours am: 5bff56abab -s ours

Browse Source

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

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

Change-Id: I472a7385324fbce5692caaa31891047ffa87e349
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:53:52 +00:00

committed by Automerger Merge Worker

parent 465086f7e8 5bff56abab

commit 8d1cb3c97a

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