OSDN Git Service

Merge "AAPT2: Add manifest merging" into mnc-dev
authorAdam Lesinski <adamlesinski@google.com>
Fri, 5 Jun 2015 01:35:13 +0000 (01:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 5 Jun 2015 01:35:15 +0000 (01:35 +0000)
commit6b717c66a70663ea9d8b972289a8d4d74d90bc5a
tree76d4392425934d9e24472d236cdb0fa9e877e024
parent0ccc940a0db0f6a779ed2cbc0f24a395046536e0
parent8c831ca87bb7c8699b2a5cb34b8d35deedf9ce4e
Merge "AAPT2: Add manifest merging" into mnc-dev