| commit | 98887f5afb919d5576ae41d80928046659010bf9 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 04 16:00:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 04 16:00:20 2023 +0000 |
| tree | 87ec480a27926505a097d2407defd5e225412d84 | |
| parent | 82f591c7e9831f39f9d6b48519386fa27506e80e [diff] | |
| parent | f2a16dcd5dbe301242d6b4d713aec7c0e324807f [diff] |
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-qpr-dev am: df30e8a45b -s ours am: f2a16dcd5d -s ours am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 aceee6876a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20749672 Change-Id: Ic9dec1ba2afc7158c176d3fbe75f99aa13906bc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>