| commit | 4478b57762e7c2ca6790eb4f9a9637ebd2538760 | [log] [tgz] |
|---|---|---|
| author | Amy Zhang <amyjojo@google.com> | Fri Apr 30 18:00:13 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 18:00:13 2021 +0000 |
| tree | a2f380b23c123b70abad13842712993f0a31ae9b | |
| parent | db27ad850def639ae8917de390aca5d019befe99 [diff] | |
| parent | a5c0cfd5955c1a593a11c2af63dcc9420100e265 [diff] |
[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: d5e3efe6b2 -s ours am: a5c0cfd595 -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: I2b63e9da2d02a0e0be6710bb7ee98f01a3c3fab9