| commit | 84a68b7be55e25a710a07addf484e29d4e4eab46 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 15:31:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 15:31:13 2023 +0000 |
| tree | 3e710f8be6958c6688f5846521e138ff59833181 | |
| parent | 4c539619a3ebd2c1cd1e437ee216f24b1940c2ef [diff] | |
| parent | d853176905a3bb30d63684330749c3e25ef438c5 [diff] |
[automerger skipped] Merge "Use Mockito 4.6.1 API" into tm-dev am: a124f7c2ba am: 691f6232e5 -s ours am: d853176905 -s ours am skip reason: Merged-In I0e301b641312f8cc4a235df5ec62acf1446cbb64 with SHA-1 f3a13e086b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20918023 Change-Id: Idc63d68cb4cca8079eb50ad69ad0faf9929a934b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>