Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "resolve merge conflicts of 6091e48325 to rvc-d1-dev" into rvc-d1-dev am: 877bbc5ee9 am: fef1ec04eb

Browse Source 
Change-Id: I0c957b61e920fb1a4f610e92af8a63fc179372f0
This commit is contained in:
Jay Aliomer
2020-04-20 00:22:40 +00:00
committed by Automerger Merge Worker
parent c69d7817cc fef1ec04eb
commit 4d7d95ff20
3 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/overlays/IconShapeHeartOverlay/AndroidManifest.xml
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"/>

0
packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml Normal file
View File

1
packages/overlays/IconShapePebbleOverlay/AndroidManifest.xml
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"/>