[automerger skipped] Merge "Change ownership of AAPT2 and libandroidfw" am: 1e0a5d397d
am: 06eb87271d -s ours
Change-Id: I01c79f94b57cdd64a97670e4b7a2e163000487ac
This commit is contained in:
1e0a5d397d
am: 06eb87271d -s ours
Change-Id: I01c79f94b57cdd64a97670e4b7a2e163000487ac