tree d384cbf809a8221a4b437bf3d24614eb54a5965b
parent de62cfc06bfd5476b46ad8e0b4b1b8d5c6a36ef7
parent dc9f87c130577c5e163e07f95b9de4e95e3a0e07
author Treehugger Robot <treehugger-gerrit@google.com> 1655960991 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655960991 +0000

[automerger skipped] [conflict] Merge "vts: fix some tunerhal vts fail without frontend device" into android11-tests-dev am: 6807799ad9 am: 88b7c10cd8 -s ours am: b22f548965 -s ours am: ff2429050c -s ours am: d3d375746c -s ours am: b88eeebd37 -s ours am: f9fff0db59 -s ours am: dc9f87c130 -s ours

am skip reason: skipped by user hgchen

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

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