tree e4addcbf166650aeecc43b521371cb9b9b0b9bda
parent 37a08d4bf46d26203f8e27f1d83bb317ef3b1dcd
parent f43dd4b03274aec128502740da915ecd6be21d4a
author Adam Lesinski <adamlesinski@google.com> 1493563504 +0000
committer android-build-merger <android-build-merger@google.com> 1493563504 +0000

Merge "AAPT2: Fix typo in manifest validation expectation" into oc-dev am: 7cf8ca95aa
am: f43dd4b032

Change-Id: I672916a11b83dea83ae9ea0048a4c22747b53733