| commit | a5edae8e195d71469a2db8d0f25a5bd74780d207 | [log] [tgz] |
|---|---|---|
| author | Josep del Río <joseprio@google.com> | Thu Jan 12 14:50:04 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 12 14:50:04 2023 +0000 |
| tree | 4dc18db076e61021806c4019d7e990946a0b319e | |
| parent | bf544d31a4d8e93367be825b0dc76635dbd857b0 [diff] | |
| parent | 80bc3ad60a33626eb83a6198222214025c63e6e1 [diff] |
[automerger skipped] Merge "NEW Use Mockito 4.6.1 API" into tm-qpr-dev am: 80bc3ad60a -s ours am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 d010065e40 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20918023 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20947434 Change-Id: Ie7a220f03d88ed11119c00fa6a3b90d143680b44 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>