Merge "resolve merge conflicts of 6091e48325 to rvc-d1-dev" into rvc-d1-dev

This commit is contained in:
Jay Aliomer
2020-04-19 23:45:39 +00:00
committed by Android (Google) Code Review
3 changed files with 0 additions and 2 deletions

View File

@@ -21,7 +21,6 @@
android:versionName="1.0">
<overlay
android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/>

View File

@@ -21,7 +21,6 @@
android:versionName="1.0">
<overlay
android:targetPackage="android"
android:targetName="IconShapeCustomization"
android:category="android.theme.customization.adaptive_icon_shape"
android:priority="1"/>