tree 570050a0c406e1bd0e87d3c780276161dd4905d4
parent 94bb40fa4f90271ee6befafbb3d5901320d9cacc
parent 6db0f812d57019f9f200893261a92cbbdc57e767
author Treehugger Robot <treehugger-gerrit@google.com> 1597264100 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597264100 +0000

Merge "libbase from latest crosvm also needs to be renamed." am: c1521b3576 am: 6d459b1c10 am: 6db0f812d5

Original change: https://android-review.googlesource.com/c/platform/development/+/1396549

Change-Id: I54dad33747b5943953859f76b1da649b5c7cc523