[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: cb8c1c6c85 -s ours

Browse Source

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

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

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

...

This commit is contained in:

Kevin Liu

2023-01-04 15:23:06 +00:00

committed by Automerger Merge Worker

parent 407a35aa78 cb8c1c6c85

commit 8e2f0b970b

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