OSDN Git Service

Merge "AAPT2: Revert warning when merging packages"
authorAdam Lesinski <adamlesinski@google.com>
Wed, 31 Aug 2016 20:18:17 +0000 (20:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 31 Aug 2016 20:18:19 +0000 (20:18 +0000)

Trivial merge