aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve merge conflicts of 629a67c5a to ub-launcher3-dorval-polish

Browse Source 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I5aed3f0c978976c499b532c816d81196cb11e3a1
This commit is contained in:
Tony
2017-06-02 19:33:49 -07:00
parent d74633cbc5 629a67c5ac
commit f514f207c2
4 changed files with 81 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AndroidManifest-common.xml
View File

@@ -82,7 +82,8 @@
<service android:name="com.android.launcher3.dynamicui.ColorExtractionService"
android:exported="false"
android:process=":wallpaper_chooser">
android:process=":wallpaper_chooser"
android:permission="android.permission.BIND_JOB_SERVICE">
</service>
<service