| commit | 4f174c7cbe0c3a8c451d522c042c3e86f3e43b8f | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Thu Jan 12 17:20:48 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 12 17:20:48 2023 +0000 |
| tree | c1b0b46879a0f7533289ca7ac8ba84462341e5b8 | |
| parent | 76134d558dea9ee1f39d26f51a3fdfc0a0a9a3e4 [diff] | |
| parent | 41536ce472ac73e7a2acc203c1a21bd0064d0793 [diff] |
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2ba am: 41536ce472 -s ours am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e40 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20839306 Change-Id: Ic501b1f358ff2594698f5df182496337dff3265d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>