Switch to unified view

a/tool/src/old/PackageSupplier.java b/tool/src/old/PackageSupplier.java