Subversion Repositories SmartDukaan

Rev

Blame | Last modification | View Log | RSS feed 

-- Merging decision tree log ---
manifest
ADDED from AndroidManifest.xml:2:1
        xmlns:android
                ADDED from AndroidManifest.xml:2:11
        package
                ADDED from AndroidManifest.xml:3:5
                INJECTED from AndroidManifest.xml:0:0
                INJECTED from AndroidManifest.xml:0:0
        android:versionName
                INJECTED from AndroidManifest.xml:0:0
                INJECTED from AndroidManifest.xml:0:0
        android:versionCode
                INJECTED from AndroidManifest.xml:0:0
                INJECTED from AndroidManifest.xml:0:0
permission#com.saholic.profittill.main.permission.C2D_MESSAGE
ADDED from AndroidManifest.xml:5:5
        android:protectionLevel
                ADDED from AndroidManifest.xml:7:9
        android:name
                ADDED from AndroidManifest.xml:6:9
uses-permission#android.permission.ACCESS_WIFI_STATE
ADDED from AndroidManifest.xml:9:5
        android:name
                ADDED from AndroidManifest.xml:9:22
uses-permission#android.permission.READ_PHONE_STATE
ADDED from AndroidManifest.xml:10:5
        android:name
                ADDED from AndroidManifest.xml:10:22
uses-permission#android.permission.READ_LOGS
ADDED from AndroidManifest.xml:11:5
        android:name
                ADDED from AndroidManifest.xml:11:22
uses-permission#android.permission.GET_TASKS
ADDED from AndroidManifest.xml:12:5
        android:name
                ADDED from AndroidManifest.xml:12:22
uses-permission#android.permission.INTERNET
ADDED from AndroidManifest.xml:13:5
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:17:5
        android:name
                ADDED from AndroidManifest.xml:13:22
uses-permission#android.permission.GET_ACCOUNTS
ADDED from AndroidManifest.xml:14:5
        android:name
                ADDED from AndroidManifest.xml:14:22
uses-permission#android.permission.USE_CREDENTIALS
ADDED from AndroidManifest.xml:15:5
        android:name
                ADDED from AndroidManifest.xml:15:22
uses-permission#android.permission.ACCESS_NETWORK_STATE
ADDED from AndroidManifest.xml:16:5
        android:name
                ADDED from AndroidManifest.xml:16:22
uses-permission#android.permission.NETWORK
ADDED from AndroidManifest.xml:17:5
        android:name
                ADDED from AndroidManifest.xml:17:22
uses-permission#android.permission.BLUETOOTH
ADDED from AndroidManifest.xml:18:5
        android:name
                ADDED from AndroidManifest.xml:18:22
uses-permission#android.permission.WAKE_LOCK
ADDED from AndroidManifest.xml:19:5
        android:name
                ADDED from AndroidManifest.xml:19:22
uses-permission#android.permission.VIBRATE
ADDED from AndroidManifest.xml:20:5
        android:name
                ADDED from AndroidManifest.xml:20:22
uses-permission#com.google.android.c2dm.permission.RECEIVE
ADDED from AndroidManifest.xml:22:5
        android:name
                ADDED from AndroidManifest.xml:22:22
uses-permission#android.permission.CALL_PHONE
ADDED from AndroidManifest.xml:23:5
        android:name
                ADDED from AndroidManifest.xml:23:22
application
ADDED from AndroidManifest.xml:25:5
MERGED from com.android.support:appcompat-v7:21.0.3:16:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.google.android.gms:play-services:6.1.71:16:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.facebook.android:facebook-android-sdk:3.20.0:24:5
MERGED from com.android.support:support-v4:21.0.3:16:5
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:44:5
MERGED from com.android.support:support-v4:21.0.3:16:5
        android:label
                ADDED from AndroidManifest.xml:29:9
        android:allowBackup
                ADDED from AndroidManifest.xml:27:9
        android:icon
                ADDED from AndroidManifest.xml:28:9
        android:theme
                ADDED from AndroidManifest.xml:30:9
        android:name
                ADDED from AndroidManifest.xml:26:9
        tools:ignore
                ADDED from com.mixpanel.android:mixpanel-android:4.5.1:44:18
meta-data#com.google.android.gms.version
ADDED from AndroidManifest.xml:31:9
        android:name
                ADDED from AndroidManifest.xml:32:13
        android:value
                ADDED from AndroidManifest.xml:33:13
meta-data#com.google.android.gms.analytics.globalConfigResource
ADDED from AndroidManifest.xml:34:9
        android:resource
                ADDED from AndroidManifest.xml:36:13
        android:name
                ADDED from AndroidManifest.xml:35:13
meta-data#com.facebook.sdk.ApplicationId
ADDED from AndroidManifest.xml:37:9
        android:name
                ADDED from AndroidManifest.xml:38:13
        android:value
                ADDED from AndroidManifest.xml:39:13
activity#com.saholic.profittill.SplashScreen
ADDED from AndroidManifest.xml:41:9
        android:label
                ADDED from AndroidManifest.xml:43:13
        android:name
                ADDED from AndroidManifest.xml:42:13
intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:44:13
action#android.intent.action.MAIN
ADDED from AndroidManifest.xml:45:17
        android:name
                ADDED from AndroidManifest.xml:45:25
category#android.intent.category.LAUNCHER
ADDED from AndroidManifest.xml:47:17
        android:name
                ADDED from AndroidManifest.xml:47:27
activity#com.saholic.profittill.main.LoginActivity
ADDED from AndroidManifest.xml:50:9
        android:windowSoftInputMode
                ADDED from AndroidManifest.xml:53:13
        android:label
                ADDED from AndroidManifest.xml:52:13
        android:name
                ADDED from AndroidManifest.xml:51:13
activity#com.saholic.profittill.main.DealsHome
ADDED from AndroidManifest.xml:55:9
        android:label
                ADDED from AndroidManifest.xml:57:13
        android:name
                ADDED from AndroidManifest.xml:56:13
activity#com.saholic.profittill.main.MainActivity
ADDED from AndroidManifest.xml:59:9
        android:uiOptions
                ADDED from AndroidManifest.xml:62:13
        android:configChanges
                ADDED from AndroidManifest.xml:61:13
        android:name
                ADDED from AndroidManifest.xml:60:13
activity#com.facebook.LoginActivity
ADDED from AndroidManifest.xml:64:9
        android:theme
                ADDED from AndroidManifest.xml:66:13
        android:name
                ADDED from AndroidManifest.xml:65:13
receiver#com.saholic.profittill.main.GcmBroadcastReceiver
ADDED from AndroidManifest.xml:68:9
        android:permission
                ADDED from AndroidManifest.xml:70:13
        android:name
                ADDED from AndroidManifest.xml:69:13
intent-filter#com.google.android.c2dm.intent.RECEIVE+com.google.android.c2dm.intent.REGISTRATION+com.saholic.profittill.main
ADDED from AndroidManifest.xml:71:13
action#com.google.android.c2dm.intent.RECEIVE
ADDED from AndroidManifest.xml:72:17
        android:name
                ADDED from AndroidManifest.xml:72:25
action#com.google.android.c2dm.intent.REGISTRATION
ADDED from AndroidManifest.xml:73:17
        android:name
                ADDED from AndroidManifest.xml:73:25
category#com.saholic.profittill.main
ADDED from AndroidManifest.xml:75:17
        android:name
                ADDED from AndroidManifest.xml:75:27
service#com.saholic.profittill.main.GCMNotificationIntentService
ADDED from AndroidManifest.xml:79:9
        android:exported
                ADDED from AndroidManifest.xml:81:13
        android:name
                ADDED from AndroidManifest.xml:80:13
activity#com.saholic.profittill.main.MObileNumberVerificationActivity
ADDED from AndroidManifest.xml:84:9
        android:label
                ADDED from AndroidManifest.xml:86:13
        android:name
                ADDED from AndroidManifest.xml:85:13
activity#com.saholic.profittill.main.MobileNumber
ADDED from AndroidManifest.xml:88:9
        android:label
                ADDED from AndroidManifest.xml:90:13
        android:name
                ADDED from AndroidManifest.xml:89:13
activity#com.saholic.profittill.main.MobileVerificationFirstTime
ADDED from AndroidManifest.xml:92:9
        android:label
                ADDED from AndroidManifest.xml:94:13
        android:name
                ADDED from AndroidManifest.xml:93:13
activity#com.saholic.profittill.Utils.SplashInternetNotWorking
ADDED from AndroidManifest.xml:96:9
        android:label
                ADDED from AndroidManifest.xml:98:13
        android:name
                ADDED from AndroidManifest.xml:97:13
meta-data#TESTIN_APPKEY
ADDED from AndroidManifest.xml:101:9
        android:name
                ADDED from AndroidManifest.xml:102:13
        android:value
                ADDED from AndroidManifest.xml:103:13
meta-data#TESTIN_CHANNEL
ADDED from AndroidManifest.xml:105:9
        android:name
                ADDED from AndroidManifest.xml:106:13
        android:value
                ADDED from AndroidManifest.xml:107:13
activity#com.saholic.profittill.main.ReferrerActivity
ADDED from AndroidManifest.xml:109:9
        android:label
                ADDED from AndroidManifest.xml:112:13
        android:configChanges
                ADDED from AndroidManifest.xml:111:13
        android:name
                ADDED from AndroidManifest.xml:110:13
receiver#com.saholic.profittill.main.ReferrerReceiver
ADDED from AndroidManifest.xml:115:9
        android:exported
                ADDED from AndroidManifest.xml:118:13
        android:enabled
                ADDED from AndroidManifest.xml:117:13
        android:name
                ADDED from AndroidManifest.xml:116:13
intent-filter#com.android.vending.INSTALL_REFERRER
ADDED from AndroidManifest.xml:119:13
action#com.android.vending.INSTALL_REFERRER
ADDED from AndroidManifest.xml:120:17
        android:name
                ADDED from AndroidManifest.xml:120:25
uses-sdk
INJECTED from AndroidManifest.xml:0:0 reason: use-sdk injection requested
MERGED from com.android.support:appcompat-v7:21.0.3:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.google.android.gms:play-services:6.1.71:15:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.facebook.android:facebook-android-sdk:3.20.0:20:5
MERGED from com.android.support:support-v4:21.0.3:15:5
MERGED from com.mixpanel.android:mixpanel-android:4.5.1:11:5
MERGED from ProfitTill:library:unspecified:7:5
MERGED from com.android.support:support-v4:21.0.3:15:5
        android:targetSdkVersion
                INJECTED from AndroidManifest.xml:0:0
                INJECTED from AndroidManifest.xml:0:0
        android:minSdkVersion
                INJECTED from AndroidManifest.xml:0:0
                INJECTED from AndroidManifest.xml:0:0
        tools:ignore
                ADDED from com.mixpanel.android:mixpanel-android:4.5.1:14:9