tree 57dac3badf44292b0b6ca26427caf6874d092410
parent 9a78ce12c102c2aa202cbcac277c02174649bfb8
parent 732463d058b613d32b8f141f69cbb6b8cc3e069f
author Ryan Mitchell <rtmitchell@google.com> 1539237017 -0700
committer android-build-merger <android-build-merger@google.com> 1539237017 -0700

[automerger skipped] AAPT2: Add the rest of supported manifest elements am: 00d5548355 am: 6ffa32f13d
am: 732463d058  -s ours

Change-Id: I250a4c6bcf5bee399f8a7ac9b20da1f6e43b55e4