[automerger skipped] Merge "Revert "Default to AAPT2 = false in AOSP only"" am: 035c5a35a6 am: 09db0149a0 -s ours

am: 7dfc10392e  -s ours

Change-Id: I951d53053e14c8ab2ea8c47a93a0f706096631f8
This commit is contained in:
Colin Cross
2018-05-29 18:17:18 -07:00
committed by android-build-merger

Diff Content Not Available