tree 31ff46012cbdf9e5b5d47a077c344aca14f9e4b7
parent f60bb4ab32474b2523fee44e621222665f66126b
parent f9abc344d6ef1dba89282da20562f33ffed74e47
author Colin Cross <ccross@android.com> 1529127421 -0700
committer android-build-merger <android-build-merger@google.com> 1529127421 -0700

Fix ManifestMerger issues
am: f9abc344d6

Change-Id: Ife4901ae5493c5e45640376055c692d0014bd997