tree fd1d652b21fa61ae5557c297fb3e1ac41add19ec
parent a58015e7e5dc2084eaace620d2b506ec3e12a7cf
parent 035c5a35a6bf9d63f86e87c29c01e8f67d5d8039
author Colin Cross <ccross@android.com> 1527641138 -0700
committer android-build-merger <android-build-merger@google.com> 1527641138 -0700

Merge "Revert "Default to AAPT2 = false in AOSP only""
am: 035c5a35a6

Change-Id: Ie75f91869a8251fa3920094fd6389d88d97e96df