tree e8de323b98b055309960374e3edcfb60629b1efd
parent d4aa519b92c3949c1e769c457a80c04660a0d3a1
parent 8f8a1abeb76dd75ac5f749eefd31a7e0452b5b0c
author Martin Stjernholm <mast@google.com> 1622056559 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622056559 +0000

Merge "Move logic to disable flattening in unbundled app mode from Soong to make." am: 0770a175a1 am: 8f8a1abeb7

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1714380

Change-Id: I7d8b1ddd5fd18468430a0b0be0686d6f365ab021