tree 3abe0d80a7f5ba306e7580d13357f3d2d0c923c1
parent 24de6a45aae21d576e84b1398ce346baf7639710
parent e3c1a4a9d21e7698e9e5196086198569ac5cc6cd
author David Chaloupka <chaloupka@google.com> 1516359473 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516359473 +0000

Merge "Handle multiple packages of same name in 'aapt2 convert'"