| commit | 4bb1562c568c3d9578debbba3e0b5fa523223ec7 | [log] [tgz] |
|---|---|---|
| author | Sorin Basca <sorinbasca@google.com> | Wed Jul 20 07:43:28 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jul 20 07:43:28 2022 +0000 |
| tree | c4b9ac5026fcc608f4a3781fbf873a9ec70def2d | |
| parent | c8b09463a9544896303461ef3da62a07c098dc66 [diff] | |
| parent | fec750d98f68b90e0cd6d842654589df3a4ed78d [diff] |
[automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours am: b9cd87f468 -s ours am: fec750d98f -s ours am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2152643 Change-Id: I88fe318dc436f21fb07ffc8e2b3c76ac0bba47a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>