[automerger skipped] Merge "Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to true" am: 7bb2aec17b
am: 241c39e8b1
-s ours
am:b53501ef3a
-s ours am skip reason: change_id I9f3dfefc3bd357d6750fbb1e418937d095720b04 with SHA10a573d798f
is in history Change-Id: Ie28afdcc7582e8bb75d11b34ec2d5c0fda08860f
This commit is contained in: