tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent fa138048781d9922d20f667816fa2bcde58f8cc3
parent 5eca469669e1160a166a10f1ffcb7510ae73b3e5
author Erik Kline <ek@google.com> 1527610239 -0700
committer android-build-merger <android-build-merger@google.com> 1527610239 -0700

[automerger skipped] Merge "Default to AAPT2 = false in AOSP only" am: 6146e28628
am: 5eca469669  -s ours

Change-Id: I328a1f5f457b55b77e941536daaaef77e40ef6ff