[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: 6b5d5e37f5 -s ours
am skip reason: change_id I9f3dfefc3bd357d6750fbb1e418937d095720b04 with SHA1 0a573d798f is in history

Change-Id: I0dffa99d11f770d4009febbdaaa15bb2b0dad9ec
This commit is contained in:
Jiyong Park
2019-07-11 18:30:43 -07:00
committed by android-build-merger

Diff Content Not Available