| commit | 23f0c2dfaa2afcc5d02a979e2aa4ba28c9dbbe2a | [log] [tgz] |
|---|---|---|
| author | Matt Sandy <msandy@google.com> | Tue Jul 30 15:00:57 2019 -0700 |
| committer | Matt Sandy <msandy@google.com> | Tue Jul 30 15:47:31 2019 -0700 |
| tree | 49353ec8d7c1cac141fb225779ce9ce73cdd6584 | |
| parent | 5b9cb2323554661da43b2d312b354e395fe68c08 [diff] | |
| parent | e20113feeadcf9713320197b5e3131c04f80a750 [diff] |
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