tree 63f3f0d35be219bd4517e75d1363d0c30d50f28f
parent e164d753718f94510159ceca578f81b766aa75b1
parent 487830bbcfbf811f9cafc06b79108005ee5f9254
author Alan Viverette <alanv@google.com> 1493746980 +0000
committer android-build-merger <android-build-merger@google.com> 1493746980 +0000

Merge "Revert "Include v4, use AAPT2"" into oc-dev
am: 487830bbcf

Change-Id: I731252c2b1de50d7d22327b2b4b963b9825dfa87