tree 5ae792ebe77fa598272cd87a47c89edd66385d3c
parent 87dfff626dae0d05685cd694abe81a2c4e238f33
parent 9f5e3e822c346b5bb31012fa1661ef7f9ffc3665
author Dan Willemsen <dwillemsen@google.com> 1535597313 -0700
committer android-build-merger <android-build-merger@google.com> 1535597313 -0700

Merge "Convert aapt to Soong" am: 7bd321ca25
am: 9f5e3e822c

Change-Id: I5a73c4d44cdbe3a5e25acda2db7dd6cd13c8e1df