tree 4283a7fc8b8a95e2871bfe93e7d234a77bbcd2f4
parent 3ad5340e5c1304af081afccf87a6785afdab075c
parent 65c42a5569473b3cd1481763d98ad39ffd49df4b
author Adam Lesinski <adamlesinski@google.com> 1493342850 +0000
committer android-build-merger <android-build-merger@google.com> 1493342850 +0000

Merge "AAPT2: Add workaround for non-standard package IDs" into oc-dev am: e7172ff9fb
am: 65c42a5569

Change-Id: I1238656a9edb9984d36412dba506b869f574e3d4