tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent 26c5246d34694938dde4d35d17958a907bafd4b4
parent 7dfc10392e86488b01981b3107f843d0be639834
author Colin Cross <ccross@android.com> 1527643038 -0700
committer android-build-merger <android-build-merger@google.com> 1527643038 -0700

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

Change-Id: I951d53053e14c8ab2ea8c47a93a0f706096631f8