Skip to content
Commit 6b5d5e37 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

[automerger skipped] Merge "Don't use prebuilt_apex when TARGET_FLATTEN_APEX... 

[automerger skipped] Merge "Don't use prebuilt_apex when TARGET_FLATTEN_APEX is set to true" am: 7bb2aec1 am: 241c39e8 -s ours
am: b53501ef -s ours
am skip reason: change_id I9f3dfefc3bd357d6750fbb1e418937d095720b04 with SHA1 0a573d79 is in history

Change-Id: Ie28afdcc7582e8bb75d11b34ec2d5c0fda08860f
parents bf6d4496 b53501ef
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment