tree 1a8023e7ae78d1b43cea23a45a0dabffff53c83a
parent bfe2580b2479391cfc194e538264d79794d077a2
parent 1e22b33f34d7cd72fa11388e65a1cca8a1d41452
author Adam Lesinski <adamlesinski@google.com> 1504637979 +0000
committer android-build-merger <android-build-merger@google.com> 1504637979 +0000

Merge "AAPT2: Make sure to fail when XML linking fails" into oc-mr1-dev
am: 1e22b33f34

Change-Id: Ic32bb2076e65d66fbba2c59f29f31d132b12fa0a