[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

Browse source

am skip reason: skipped by user hgchen

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

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

...

This commit is contained in:

Treehugger Robot 2022-06-23 03:19:01 +00:00 committed by Automerger Merge Worker

parent ced9514d25 b22f548965

commit ff2429050c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available