| commit | 2c820e0cdb72fc8dce1c977fbeb6e38028530c47 | [log] [tgz] |
|---|---|---|
| author | Kevin Liu <congxiliu@google.com> | Wed Jan 11 19:33:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 11 19:33:31 2023 +0000 |
| tree | 32c2c764576ac6da3ffc8b12f594e9876cd96fb0 | |
| parent | d7395b13298980d501e5cb958b9f32bfa5f9f72f [diff] | |
| parent | 9a8220699c8f01a1d05ade83eae4759a08a641c9 [diff] |
Merge "Revert "[automerger skipped] Merge "Use Mockito 4.6.1 API" into ..."" into tm-qpr-dev-plus-aosp am: 9a8220699c -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: I2307282f053c662465414535200cd343415fed0f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>