tree 6d59b5b7b7378ec1799f812fa4fe483105ce92df
parent 8bc750eb629cbce0b6269bddda49240c80f0b2d9
parent 6146e2862870f4e83267e95d0ec90fdbf0f3f561
author Erik Kline <ek@google.com> 1527609875 -0700
committer android-build-merger <android-build-merger@google.com> 1527609875 -0700

Merge "Default to AAPT2 = false in AOSP only"
am: 6146e28628

Change-Id: I15ce6a49f40ebf190c021b60a3e1abff31bc0a9c