tree 04bda56c8f2abddbf24600ef06faf21af5c85005
parent 5ac895ff041aa7346368ea9650f47341a1efb591
parent 735d6605ca9f680f32e0e5d2265ce7c6f5715c40
author Sorin Basca <sorinbasca@google.com> 1658301073 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1658301073 +0000

[automerger skipped] Merge "Use Mockito 4.6.1 API" am: f5fb8846f1 -s ours am: c00dd4cf81 -s ours am: 12dcda5d03 -s ours am: 735d6605ca -s ours

am skip reason: Merged-In I424015a4ec7e28c4775f7d2614d10d0958dcdb2e with SHA-1 231ccd51ad is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/2151452

Change-Id: I81210b0a55e97e0917d1823ee35abb631a18b274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>