[automerger skipped] Merge "Remove Soong intermediates after renaming core variant" am: 55406a8458
am: c37ff6ede2
am: d86ccbd3dc
-s ours
am skip reason: Change-Id Ib10a9cf8a8c9109279523f811764afff34969368 with SHA-1 c9ea2ffc78
is in history
Change-Id: I5245b930a21c2fb89d7d167671bad7fe26bf7a31
This commit is contained in:
commit
fe2248e753