tree e62aa47c85b11a9064eac8554308ce9b5b751a86
parent ce8a10b54c002aa176f263cc455b30963809e6d4
parent 0588a4e12126740370507d068e3cef6f912239a9
author Colin Cross <ccross@android.com> 1529107162 -0700
committer android-build-merger <android-build-merger@google.com> 1529107162 -0700

Fix ManifestMerger issues am: 4a5ff8044c
am: 0588a4e121

Change-Id: I191f10abea34d05b036f3a2a57572fc58fef4f26