1. 8c831ca AAPT2: Add manifest merging by Adam Lesinski ยท 11 years ago