| commit | 552d53dd50cea6f012c8da1627f5a7b5de814d46 | [log] [tgz] |
|---|---|---|
| author | Cody Schuffelen <schuffelen@google.com> | Tue Nov 13 17:38:26 2018 -0800 |
| committer | Cody Schuffelen <schuffelen@google.com> | Wed Nov 14 23:33:08 2018 +0000 |
| tree | 6e4cf222ce6ad27075ab08e77bd100941d36081d | |
| parent | aa69622db2d98fa406c985a8dc293237f50498ca [diff] | |
| parent | 5c9f87a8f92c6b8ba4369aef4cfbea542fb71dac [diff] |
Merge aosp/master into cuttlefish-testing Generated through: git merge aosp/master --no-ff git checkout --ours host/commands/launch/main.cc git checkout --ours host/libs/vm_manager/qemu_manager.cpp Bug: 119522286 Test: Built and launched aosp_cf_x86_phone-userdebug. Change-Id: Ica3e160441f263c97eda5687a68f70d3a95f08f2