[automerger skipped] Migrate to AAPT2 am: 2789e544f1
am: 27f2c17447 -s ours
Change-Id: I86baf6d6e4411d554e70dc5c11fbce52d0c65ae1
This commit is contained in:
2789e544f1
am: 27f2c17447 -s ours
Change-Id: I86baf6d6e4411d554e70dc5c11fbce52d0c65ae1