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)

Trivial merge