tag 149f6fdab1af5b91cb5416ab3f4a4edd9269ce83
tagger The Android Open Source Project <initial-contribution@android.com> Tue Jul 10 11:34:24 2018 -0700
object 76fe40120845f5d60f7ee6cc2eaf5a88ca9f3f3e

Android O MR1 IOT Release 1.0.2 (4862549)

commit 76fe40120845f5d60f7ee6cc2eaf5a88ca9f3f3e
author Colin Cross <ccross@android.com> Thu Jun 14 15:19:14 2018 -0700
committer Colin Cross <ccross@android.com> Thu Jun 14 15:24:33 2018 -0700
tree 492e09be3418fc119200c0d6c03a085081908cd7
parent cf8166519ca35bb5d64dfad0b3827e39778f2e81

Fix ManifestMerger issues

Set LOCAL_MIN_SDK_VERSION in car-settings-lib so that the build system
doesn't raise the minSdkVersion value specified in the manifest, which
causes ManifestMerger to error when trying to merge it into a package
that specifies a lower minSdkVersion.

Remove the empty application with an android:label from
car-stream-ui-lib which causes ManifestMerger to error when combining
two applications with different labels.

Bug: 78447299
Test: m java
Change-Id: I12230134d53a949a0e52dba7224cbec882fd8380