| commit | d5e3efe6b25e81dc6e2db18060ba60850b51c5cc | [log] [tgz] |
|---|---|---|
| author | Amy Zhang <amyjojo@google.com> | Fri Apr 30 17:31:39 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 30 17:31:39 2021 +0000 |
| tree | a2f380b23c123b70abad13842712993f0a31ae9b | |
| parent | 180ffd4bc0c80b13c285b97a9b61a47e352dda0c [diff] | |
| parent | fdeac2b2aa476103d3536511bf7f219bb8fdc057 [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 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