tree 0cde86989ef42cbb75414e6e14f2c4e2b8f90684
parent 62df67ddf7bcb0b8a80089ed7d667775f9c12406
parent 5ecf327a7cf6fbf62e6b9c6f1614ead4806d8648
author Colin Cross <ccross@android.com> 1539237602 -0700
committer android-build-merger <android-build-merger@google.com> 1539237602 -0700

Merge changes from topic "aapt2-manifest-elements" am: e75f2f504e
am: 5ecf327a7c

Change-Id: I617de6384545e3ca6050d9c7b829397c0dfcb1a2