tree b5fb050ecef07e3f2020513a526f6a99f46554c4
parent 74be875eb4f8ef9dcad885975f050c9793da4439
parent 09db0149a04d5f5023b20b610e003d480b79a43d
author Colin Cross <ccross@android.com> 1527642882 -0700
committer android-build-merger <android-build-merger@google.com> 1527642882 -0700

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

Change-Id: I66209abfe3fa4984473c5f09a52e472f6fe47978