gadget: Fix mismerge of LA.VENDOR.1.0.r1-23800-WAIPIO.QSSI14.0

Change-Id: I71203dd21fe1333db9fbeb18eab3cd3290544b40
1 file changed
tree: 8a9f9a7de545df11ba9d3e8530460d1b52cf6f19
  1. etc/
  2. hal/
  3. .gitupstream
  4. vendor_product.mk