tree c7c5973e42c10b353304957ffdf0a56809bce344
parent 98f2d8b24dd15c1382903758d81338a0b6cc1534
parent d42697bcb8effa8bc7e35f1b17b343593f39ce9c
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579038171 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579038171 +0000

Merge "Revert "Improve BUILT_ASSEMBLED_*_MANIFEST checks"" am: 19705c6987 am: 4192ca4845 am: d42697bcb8

Change-Id: Ia9e28da8c7142a10e9a4a5c6d9c166f5e34315c6