resolve merge conflicts of 6091e48325 to rvc-d1-dev
Change-Id: I2f10d3be544d57ae0d1fd82c411118127a1f0af4 Bug: 153578676
This commit is contained in:
@@ -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"/>
|
||||
|
||||
|
||||
@@ -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"/>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user