rebase
This commit is contained in:
@@ -0,0 +1,57 @@
|
||||
-- Merging decision tree log ---
|
||||
manifest
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
package
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:2:5-35
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
android:versionName
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
android:versionCode
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:1-15:12
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
xmlns:android
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:1:11-69
|
||||
uses-permission#android.permission.KILL_BACKGROUND_PROCESSES
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:4:5-84
|
||||
android:name
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:4:22-81
|
||||
application
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:5:5-14:19
|
||||
service#com.mogo.module.main.service.MogoMainService
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:6:9-13:19
|
||||
android:enabled
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:8:13-35
|
||||
android:exported
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:9:13-36
|
||||
android:name
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:7:13-52
|
||||
intent-filter#action:name:com.mogo.launcher.action.MAIN_SERVICE
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:10:13-12:29
|
||||
action#com.mogo.launcher.action.MAIN_SERVICE
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:11:17-80
|
||||
android:name
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml:11:25-77
|
||||
uses-sdk
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml reason: use-sdk injection requested
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
android:targetSdkVersion
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
android:minSdkVersion
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
ADDED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
INJECTED from /Users/arrowem/Documents/androidProject/Launcher/modules/mogo-module-main/src/main/AndroidManifest.xml
|
||||
Reference in New Issue
Block a user