| commit | d7395b13298980d501e5cb958b9f32bfa5f9f72f | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 19:32:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 19:32:58 2023 +0000 |
| tree | 32c2c764576ac6da3ffc8b12f594e9876cd96fb0 | |
| parent | 2e110d9126bb59b9bd4d828c58c0f90d0b44b786 [diff] | |
| parent | 09dced429e64ae90acbbd9f68664cf4136ce123d [diff] |
Revert "[automerger skipped] Merge "Use Mockito 4.6.1 API" into ..." am: 09dced429e -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/+/20944164 Change-Id: Ie436d944e96219a967753a22e617a30e7434d586 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>