Skip to content
Commit d8531769 authored by Kevin Liu's avatar Kevin Liu Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2... 

[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2 am: 691f6232 -s ours

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

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



Change-Id: I0bb15fbdcf28049d0eeccd29564cb744accc0957
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b00fd1d7 691f6232
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment