[automerger skipped] Merge "Allow users to switch between FE source and DVR source when testing record/descrambling/broadcast" am: ddafbe597c am: 19746b1629 am: fdeac2b2aa -s ours

am skip reason: Merged-In I6c57657ac3539d6a6fb3f63d2ecc9af7f6b9e2dc with SHA-1 160a72c9e2 is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1690329

Change-Id: Id442047e62940b40db458a4ea362f8635b5f8ace
This commit is contained in:
Amy Zhang
2021-04-30 17:31:39 +00:00
committed by Automerger Merge Worker

Diff Content Not Available