tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent 42b686144f93d77c143f9c0f3aa0fd1f2167bd00
parent 66cac57064c302de82ebf9ff8e2183af2500aeb3
author Erik Kline <ek@google.com> 1527610573 -0700
committer android-build-merger <android-build-merger@google.com> 1527610573 -0700

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

Change-Id: I224ae1137ac2c9cafe0301ca3648cab7a6dd3347