| commit | c74b541d6bd813e77b474e15ac67954d02ed4939 | [log] [tgz] |
|---|---|---|
| author | Amy Zhang <amyjojo@google.com> | Sun May 16 10:11:21 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun May 16 10:11:21 2021 +0000 |
| tree | d98bcde3c8663ef564aa448e1989f8e1eb8a0564 | |
| parent | 8822c9a121b613d8573501953e1de888c1a667e4 [diff] | |
| parent | 4478b57762e7c2ca6790eb4f9a9637ebd2538760 [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: 4478b57762 -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: I021ea5968a7a5980736c9bc06d0215f8f6ee644c