tree ed9b609395aa6970f429ba33791c643f1c34b88f
parent 0370f2f59fff9ea99bd0caef3212a57968f85325
parent b73580d2fa1404b592ac28c1601ade5089894323
author Jack He <siyuanh@google.com> 1554964839 -0700
committer android-build-merger <android-build-merger@google.com> 1554964839 -0700

Merge "Revert "Remove overlay logic from package manager and parser"" into qt-dev
am: b73580d2fa

Change-Id: Id0c9df23459007a8063e1d508c500c5145a63170