tree 49353ec8d7c1cac141fb225779ce9ce73cdd6584
parent 5b9cb2323554661da43b2d312b354e395fe68c08
parent e20113feeadcf9713320197b5e3131c04f80a750
author Matt Sandy <msandy@google.com> 1564524057 -0700
committer Matt Sandy <msandy@google.com> 1564526851 -0700

merge biscotti-4.18 into machina-4.18

This integrates support for virtio-wayland and virtio-magma from the
biscotti-4.18 branch. It also merges biscotti_defconfig into
machina_defconfig, deleting the former.

Test: ran guest_integration_tests
Change-Id: I19b9df0e5766526f93dc0b89be6cc8fdb025be9e