tree 4c77a852ac1be16c77fbcf85e116702da3af9a1a
parent 7a0b9b07df16eb90fa435f8b6a64982f3b12fef3
parent 678fa53dc70396aacb65354bbf961571d1c1c36d
author Colin Cross <ccross@android.com> 1526940845 -0700
committer android-build-merger <android-build-merger@google.com> 1526940845 -0700

Merge "Use AAPT2 for modules with manifest validation errors" am: 55d44f5eeb
am: 678fa53dc7

Change-Id: Iae86b58f96f1c807bc321d10293e63edffed7f41