tree 4b92f07c4dc76f1feddb9c162f2d89436682f476
parent 5156a6f8282f7d85f879a6b9c5db31f85840fcf0
parent 06e7c5b659bfe26e4c05c3a2f2959fe887dc84af
author Alan Viverette <alanv@google.com> 1525724441 -0700
committer android-build-merger <android-build-merger@google.com> 1525724441 -0700

[automerger skipped] Migrate to AAPT2 am: 57e41657aa
am: 06e7c5b659  -s ours

Change-Id: Ideba2127bf3c0c003273812893a075f0815e5db3