Merge "resolve merge conflicts of 6091e48325 to rvc-d1-dev" into rvc-d1-dev
This commit is contained in:
@@ -21,7 +21,6 @@
|
|||||||
android:versionName="1.0">
|
android:versionName="1.0">
|
||||||
<overlay
|
<overlay
|
||||||
android:targetPackage="android"
|
android:targetPackage="android"
|
||||||
android:targetName="IconShapeCustomization"
|
|
||||||
android:category="android.theme.customization.adaptive_icon_shape"
|
android:category="android.theme.customization.adaptive_icon_shape"
|
||||||
android:priority="1"/>
|
android:priority="1"/>
|
||||||
|
|
||||||
|
|||||||
@@ -21,7 +21,6 @@
|
|||||||
android:versionName="1.0">
|
android:versionName="1.0">
|
||||||
<overlay
|
<overlay
|
||||||
android:targetPackage="android"
|
android:targetPackage="android"
|
||||||
android:targetName="IconShapeCustomization"
|
|
||||||
android:category="android.theme.customization.adaptive_icon_shape"
|
android:category="android.theme.customization.adaptive_icon_shape"
|
||||||
android:priority="1"/>
|
android:priority="1"/>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user